Dante 7e978e5d64 Merge remote-tracking branch 'upstream/3.0.1.8' into 3.0.1.7-Gmail

2016-03-15 10:51:18 -04:00

..

bin

…

classes

Merge remote-tracking branch 'upstream/3.0.1.8' into 3.0.1.7-Gmail

2016-03-15 10:51:18 -04: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

Merged in cmdeguzman/cdgz-processmaker/HOR-298 (pull request #3815)

2016-03-15 09:32:20 -04:00

includes

…

js

Merged in rodrimus/processmaker/OM-376 (pull request #3819)

2016-03-14 18:35:24 -04:00

lib

…

menus

HOR-265

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

methods

Merge remote-tracking branch 'upstream/3.0.1.8' into 3.0.1.7-Gmail

2016-03-15 10:51:18 -04:00

plugins

…

skinEngine

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

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

src

Merge remote-tracking branch 'upstream/3.0.1.8' into 3.0.1.7-Gmail

2016-03-15 10:51:18 -04:00

templates

Merged in luisfernandosl/processmaker/HOR-436-C-3018 (pull request #3833)

2016-03-15 09:31:21 -04:00

test

…

xmlform

…

gulliver-win.bat

…

PmBootstrap.php

…