Paula Quispe 2a850ede19 conflicts: merge develop

2021-12-02 11:58:33 -04:00

..

bin

PMCORE-3527-A

2021-11-16 14:02:31 -04:00

classes

Merged in bugfix/PMCORE-3556 (pull request #8307)

2021-12-02 14:40:01 +00:00

config

Merged in bugfix/PMCORE-573 (pull request #8027)

2021-08-17 12:54:13 +00:00

content

conflicts: merge develop

2021-12-02 11:58:33 -04:00

controllers

conflicts: merge develop

2021-12-02 11:58:33 -04:00

data

conflicts: merge develop

2021-12-02 11:58:33 -04:00

includes

…

js

PMCORE-737

2020-09-17 16:04:10 -04:00

lib

PMCORE-2970 Review the WARNING in the file workflow/engine/lib/Xml/DOMDocumentExtended.php

2021-04-20 00:09:02 -04:00

menus

PMCORE-965

2021-08-05 12:57:12 -04:00

methods

PMCORE-3582

2021-12-01 18:23:51 +00:00

plugins

PMC-1445 Update gitignore file

2019-11-28 16:32:15 -04:00

skinEngine

epic PMCORE-2730

2021-04-27 13:57:10 +00:00

src

conflicts: merge develop

2021-12-02 11:58:33 -04:00

templates

PMCORE-3582

2021-12-01 18:23:51 +00:00

xmlform

Merged in feature/PMCORE-3049 (pull request #7964)

2021-09-06 20:40:34 +00:00

gulliver-win.bat

…

PmBootstrap.php

PMCORE-1323 Remove the possibility of change the memory_limit

2020-05-25 17:11:23 -04:00