Paula V. Quispe bb818ba50c conflict

2016-07-22 10:59:13 -04:00

..

bin

conflict

2016-07-22 10:59:13 -04:00

classes

conflict

2016-07-22 10:59:13 -04:00

config

Solving conflicts with branch 3.1-CONTENT

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

content

…

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

Merged in julceslau/processmaker/3.1 (pull request #4605)

2016-07-21 18:36:45 -04:00

plugins

…

skinEngine

…

src

Merged in julceslau/processmaker/3.1 (pull request #4605)

2016-07-21 18:36:45 -04:00

templates

HOR-788

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

test

…

xmlform

…

gulliver-win.bat

…

PmBootstrap.php

…