Julio Cesar Laura Avendaño ee4cc9629e Merge remote-tracking branch 'upstream/3.1-CONTENT' into 3.1

2016-07-21 16:41:42 -04:00

..

bin

Solving conflicts with branch 3.1-CONTENT

2016-07-21 16:33:27 -04:00

classes

Merge remote-tracking branch 'upstream/3.1-CONTENT' into 3.1

2016-07-21 16:41:42 -04:00

config

Solving conflicts with branch 3.1-CONTENT

2016-07-20 16:28:13 -04:00

content

Updating .po file for sprint HOR-13

2016-07-12 08:52:54 -04:00

controllers

Solving conflicts with branch 3.1-CONTENT

2016-07-20 16:28:13 -04:00

data

Solving conflicts with branch 3.1-CONTENT

2016-07-21 16:33:27 -04:00

includes

…

js

…

lib

…

menus

…

methods

Solving conflicts with branch 3.1-CONTENT

2016-07-21 16:33:27 -04:00

plugins

…

skinEngine

…

src

Solving conflicts with branch 3.1-CONTENT

2016-07-21 16:33:27 -04:00

templates

HOR-788

2016-07-21 12:44:23 -04:00

test

…

xmlform

…

gulliver-win.bat

…

PmBootstrap.php

…