jennylee 103daf3650 Merge branch 'master' of bitbucket.org:jennydmz/processmaker ...

Conflicts:
	workflow/engine/js/stagesmap/core/stagesmap.js
	workflow/engine/xmlform/tracker/tracker_Configuration.xml

2014-06-05 09:55:43 -04:00

..

login.xml

…

tracker_AvailableCaseTrackerObjects.xml

…

tracker_AvailableStageTasks.xml

…

tracker_back.xml

…

tracker_ConditionsEdit.xml

…

tracker_Configuration.html

…

tracker_Configuration.xml

Merge branch 'master' of bitbucket.org:jennydmz/processmaker

2014-06-05 09:55:43 -04:00

tracker_DynaDocs.xml

…

tracker_Inputdocs.xml

…

tracker_Messages.xml

…

tracker_MessagesView.xml

…

tracker_No.xml

…

tracker_objectsList.xml

…

tracker_objectsOptions.xml

…

tracker_Outputdocs.xml

…

tracker_StageEdit.xml

…

tracker_StageTasks.xml

…

tracker_TasksOptions.xml

…

tracker_TransferHistory.xml

…

tracker_ViewAnyInputDocument1.xml

…

tracker_ViewAnyInputDocument2.xml

…

tracker_ViewAnyInputDocument3.xml

…

tracker_ViewAnyInputDocument.xml

…

tracker_ViewAnyOutputDocument.xml

…