jennylee 4629ff8add Fixing a merge error

2015-04-17 10:48:39 -04:00

..

bin

…

classes

Fixing a merge error

2015-04-17 10:48:39 -04:00

config

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

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

content

…

controllers

Merged in cochalo/processmaker/PM-2256 (pull request #1924)

2015-04-16 08:37:08 -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

update login

2015-04-15 16:11:04 -04:00

src

PM-2112 "Fix: 0016986: REST endpoint PUT /{workspace}/oauth2/token sets.." SOLVED

2015-04-17 10:04:59 -04:00

templates

update login

2015-04-15 16:11:04 -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

…