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

..

additionalTables

Updating oauth local auth.

2014-04-21 10:21:03 -04:00

appFolder

Updating oauth local auth.

2014-04-21 10:21:03 -04:00

authSources

Updating oauth local auth.

2014-04-21 10:21:03 -04:00

cases

Updating oauth local auth.

2014-04-21 10:21:03 -04:00

dbConnections

Merge code github > bitbucket 2014-05-23 16:35

2014-05-23 16:32:18 -04:00

departments

Updating oauth local auth.

2014-04-21 10:21:03 -04:00

dynaforms

Merge code github > bitbucket 2014-05-23 16:35

2014-05-23 16:32:18 -04:00

events

Updating oauth local auth.

2014-04-21 10:21:03 -04:00

groups

Updating oauth local auth.

2014-04-21 10:21:03 -04:00

gulliver

Updating oauth local auth.

2014-04-21 10:21:03 -04:00

inputdocs

Updating oauth local auth.

2014-04-21 10:21:03 -04:00

login

Updating oauth local auth.

2014-04-21 10:21:03 -04:00

messages

Updating oauth local auth.

2014-04-21 10:21:03 -04:00

outputdocs

Updating oauth local auth.

2014-04-21 10:21:03 -04:00

patterns

Updating oauth local auth.

2014-04-21 10:21:03 -04:00

processCategory

Updating oauth local auth.

2014-04-21 10:21:03 -04:00

processes

BUG 14403 "The picker in variables of a..." SOLVED

2014-05-02 16:37:09 -04:00

reports

Updating oauth local auth.

2014-04-21 10:21:03 -04:00

reportTables

Updating oauth local auth.

2014-04-21 10:21:03 -04:00

roles

Updating oauth local auth.

2014-04-21 10:21:03 -04:00

services

Updating oauth local auth.

2014-04-21 10:21:03 -04:00

setup

Updating oauth local auth.

2014-04-21 10:21:03 -04:00

steps

Updating oauth local auth.

2014-04-21 10:21:03 -04:00

tasks

Updating oauth local auth.

2014-04-21 10:21:03 -04:00

tools

Updating oauth local auth.

2014-04-21 10:21:03 -04:00

tracker

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

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

triggers

Updating oauth local auth.

2014-04-21 10:21:03 -04:00

users

Updating oauth local auth.

2014-04-21 10:21:03 -04:00