Chloe Deguzman c4c114e8eb HOR-298 Resolving merge conflict with schema.sql

2016-03-09 22:20:30 +00:00

..

bin

GI-244 No se distingue el uso de las licencias....

2016-01-08 14:23:58 -04:00

classes

HOR-298 Resolving merge conflict with schema.sql

2016-03-09 22:20:30 +00:00

config

HOR-298 Resolving merge conflict with schema.sql

2016-03-09 22:20:30 +00:00

content

…

controllers

Merged in cmdeguzman/cdgz-processmaker/HOR-282-3018 (pull request #3783)

2016-03-09 17:52:49 -04:00

data

HOR-298 Resolving merge conflict with schema.sql

2016-03-09 22:20:30 +00:00

includes

…

js

…

lib

…

menus

HOR-265

2016-03-08 16:30:13 -04:00

methods

Merged in cmdeguzman/cdgz-processmaker/HOR-282-3018 (pull request #3783)

2016-03-09 17:52:49 -04:00

plugins

…

skinEngine

Merged in cmdeguzman/cdgz-processmaker/HOR-282-3018 (pull request #3783)

2016-03-09 17:52:49 -04:00

src

Merged in cmdeguzman/cdgz-processmaker/HOR-282-3018 (pull request #3783)

2016-03-09 17:52:49 -04:00

templates

Merged in paulis/processmaker/HOR-180-B (pull request #3772)

2016-03-08 17:50:03 -04:00

test

HOR-284

2016-02-29 15:28:21 -04:00

xmlform

…

gulliver-win.bat

…

PmBootstrap.php

…