Paula Quispe 83c441f525 Conflicts

2019-09-12 15:10:46 -04:00

..

additionalTables

…

appFolder

…

authSources

…

cases

PMC-1107

2019-08-26 15:15:40 -04:00

dbConnections

…

departments

…

dynaforms

Merged in paulis/processmaker/HOR-2114 (pull request #5231)

2016-12-06 21:42:04 +00:00

events

…

groups

…

gulliver

…

inputdocs

…

ldapAdvanced

…

login

PMC-359

2019-04-15 14:02:16 -04:00

messages

PMC-1094

2019-08-22 09:40:20 -04:00

outputdocs

PMC-1094

2019-08-22 09:40:20 -04:00

patterns

…

processCategory

…

processes

…

reports

…

reportTables

…

roles

…

services

…

setup

…

steps

…

tasks

HOR-2909 improvement

2017-05-19 09:06:35 -04:00

tools

…

tracker

…

triggers

HOR-2114

2016-12-01 09:58:31 -05:00

users

PMC-1107

2019-08-26 15:15:40 -04:00