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

…

lib

…

menus

…

methods

PMCORE-3582

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

plugins

…

skinEngine

…

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

…