Ronald Q 65c4922619 solved conflict composer.lock, config/app.php, workflow/engine/classes/SpoolRun.php

2019-07-11 10:23:48 -04:00

..

bin

Merge remote-tracking branch 'origin/release/3.3.9' into bugfix/PMC-580

2019-05-07 14:47:01 -04:00

classes

solved conflict composer.lock, config/app.php, workflow/engine/classes/SpoolRun.php

2019-07-11 10:23:48 -04:00

config

Merge with develop: solving conflicts

2019-05-29 13:12:45 -04:00

content

Merge with develop: solving conflicts

2019-05-29 13:12:45 -04:00

controllers

PMC-380

2019-05-15 22:18:05 -04:00

data

Merge with develop: solving conflicts

2019-05-29 13:12:45 -04:00

includes

…

js

PMC-379-A

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

lib

…

menus

PMC-608

2019-03-22 12:44:12 -04:00

methods

Merge with develop: solving conflicts

2019-05-29 13:12:45 -04:00

plugins

…

skinEngine

…

src

PMC-895

2019-07-04 13:25:42 -04:00

templates

Merge with develop: solving conflicts

2019-05-29 13:12:45 -04:00

xmlform

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

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

gulliver-win.bat

…

PmBootstrap.php

…