Roly Rudy Gutierrez Pinto 7f55e951fa PMC-980 Merge remote-tracking branch 'upstream/feature/PMC-43' into bugfix/PMC-980 ...

# Conflicts:
#	workflow/engine/classes/WsBase.php

2019-07-22 11:24:00 -04:00

..

bin

PMC-980 Merge remote-tracking branch 'upstream/feature/PMC-43' into bugfix/PMC-980

2019-07-22 11:24:00 -04:00

classes

PMC-980 Merge remote-tracking branch 'upstream/feature/PMC-43' into bugfix/PMC-980

2019-07-22 11:24:00 -04:00

config

PMC-980 Merge remote-tracking branch 'upstream/feature/PMC-43' into bugfix/PMC-980

2019-07-22 11:24:00 -04:00

content

PMC-980 Merge remote-tracking branch 'upstream/feature/PMC-43' into bugfix/PMC-980

2019-07-22 11:24:00 -04:00

controllers

PMC-476

2019-05-29 11:07:49 -04:00

data

PMC-980 Merge remote-tracking branch 'upstream/feature/PMC-43' into bugfix/PMC-980

2019-07-22 11:24:00 -04:00

includes

HOR-3768

2017-08-22 14:37:54 -04:00

js

PMC-379-A

2019-04-10 11:02:51 -04:00

lib

…

menus

Merged in release/3.3.13 (pull request #6946)

2019-06-27 17:10:46 +00:00

methods

PMC-980 Merge remote-tracking branch 'upstream/feature/PMC-43' into bugfix/PMC-980

2019-07-22 11:24:00 -04:00

plugins

HOR-4527

2018-05-08 10:16:52 -04:00

skinEngine

PMC-60

2018-12-19 09:44:40 -04:00

src

PMC-980 Merge remote-tracking branch 'upstream/feature/PMC-43' into bugfix/PMC-980

2019-07-22 11:24:00 -04:00

templates

PMC-980 Merge remote-tracking branch 'upstream/feature/PMC-43' into bugfix/PMC-980

2019-07-22 11:24:00 -04:00

xmlform

Merged in bugfix/PMC-359 (pull request #6854)

2019-04-18 19:52:51 +00:00

gulliver-win.bat

…

PmBootstrap.php

HOR-4924

2018-10-17 15:15:44 -04:00