Dheeyi William f86e659c88 Merge remote-tracking branch 'upstream/3.1' into HOR-1087 ...

Conflicts:
	workflow/engine/classes/class.derivation.php

2016-06-08 12:19:39 -04:00

..

bin

HOR-1089

2016-06-02 11:16:30 -04:00

classes

Merge remote-tracking branch 'upstream/3.1' into HOR-1087

2016-06-08 12:19:39 -04:00

config

…

content

…

controllers

HOR-61: new feature expiration date

2016-06-02 10:23:09 -04:00

data

…

includes

…

js

…

lib

…

menus

…

methods

Merged in paulis/processmaker/HOR-61-31 (pull request #4343)

2016-06-07 16:19:20 -04:00

plugins

…

skinEngine

…

src

Merged in qronald/processmaker/HOR-1237 (pull request #4364)

2016-06-08 11:59:34 -04:00

templates

Merged in paulis/processmaker/HOR-61-31 (pull request #4343)

2016-06-07 16:19:20 -04:00

test

Merged in paulis/processmaker/HOR-1089 (pull request #4345)

2016-06-03 10:12:55 -04:00

xmlform

…

gulliver-win.bat

…

PmBootstrap.php

HOR-1089

2016-06-02 11:16:30 -04:00