dheeyi 50fa0b2f17 Merge remote branch 'upstream/master' into PM-2104

2015-04-17 14:38:40 -04:00

..

bin

…

classes

Merge remote branch 'upstream/master' into PM-2104

2015-04-17 14:38:40 -04:00

config

PM-2320 "Add DEL_RISK_DATE field in tables Delegation..." SOLVED

2015-04-15 14:52:15 -04:00

content

…

controllers

Merge remote branch 'upstream/master' into PM-2104

2015-04-16 13:07:30 -04:00

data

PM-2320 "Add DEL_RISK_DATE field in tables Delegation..." SOLVED

2015-04-15 14:52:15 -04:00

includes

…

js

…

lib

…

menus

…

methods

Merged in victorsl/processmaker/DEL_RISK_DATE (pull request #1929)

2015-04-15 17:48:15 -04:00

plugins

…

skinEngine

Merge remote branch 'upstream/master' into PM-2104

2015-04-16 13:07:30 -04:00

src

Merged in cochalo/processmaker/PM-2333 (pull request #1934)

2015-04-17 12:53:35 -04:00

templates

Merge remote branch 'upstream/master' into PM-2104

2015-04-16 13:07:30 -04:00

test

…

xmlform

Merged in cochalo/processmaker/PM-2335 (pull request #1936)

2015-04-17 08:45:38 -04:00

gulliver-win.bat

…

PmBootstrap.php

…