Julio Cesar Laura Avendaño 001901314b Solving conflicts with branch 3.1-CONTENT

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

..

bin

Solving conflicts with branch 3.1-CONTENT

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

classes

Solving conflicts with branch 3.1-CONTENT

2016-07-20 16:28:13 -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-20 16:28:13 -04:00

includes

…

js

…

lib

…

menus

…

methods

Solving conflicts with branch 3.1-CONTENT

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

plugins

…

skinEngine

…

src

Solving conflicts with branch 3.1-CONTENT

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

templates

Merged in luisfernandosl/processmaker/HOR-1443-31 (pull request #4593)

2016-07-20 16:04:44 -04:00

test

…

xmlform

…

gulliver-win.bat

…

PmBootstrap.php

…