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

…

content

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

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

controllers

…

data

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

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

includes

…

js

…

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

…

gulliver-win.bat

…

PmBootstrap.php

…