danteloayza cff0e2c6e1 Non conflict files

2015-03-26 17:37:32 -04:00

..

appFolder/core

…

cases

PM-1672 upload file to [pmDynaform]

2015-03-25 12:20:48 -04:00

controls

…

dashboard/core

…

dbConnections

…

departments

…

dynaformEditor/core

PM-1030 "2 dynaforms with same name" SOLVED

2014-12-09 15:42:11 -04:00

dynaforms

…

events

…

groups

…

processes

…

processmap/core

Merge branch 'master' of bitbucket.org:colosa/processmaker into CONSOLIDATED

2015-03-25 16:24:09 -04:00

reports

…

setup

…

stagesmap/core

…

strategicDashboard

Non conflict files

2015-03-26 17:37:32 -04:00

tracker

…