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

2019-07-11 11:03:09 -04:00

..

bin

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

2019-07-11 11:03:09 -04:00

classes

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

2019-07-11 11:03:09 -04:00

config

Merge with develop: solving conflicts

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

content

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

2019-07-11 11:03:09 -04:00

controllers

PMC-476

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

data

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

2019-07-11 11:03:09 -04:00

includes

…

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

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

2019-07-11 11:03:09 -04:00

plugins

…

skinEngine

…

src

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

2019-07-11 11:03:09 -04:00

templates

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

2019-07-11 11:03:09 -04:00

xmlform

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

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

gulliver-win.bat

…

PmBootstrap.php

…