Rodrigo Quelca 496fd3bbc7 Merged in feature/PMCORE-2314 (pull request #7652) ...

PMCORE-2314

2020-12-19 02:23:49 +00:00

..

bin

…

classes

fix merge conflicts

2020-12-18 19:28:38 +00:00

config

fix merge conflicts

2020-12-18 19:28:38 +00:00

content

PMCORE-2584

2020-12-18 21:44:04 -04:00

controllers

…

data

PMCORE-2602

2020-12-19 01:52:57 +00:00

includes

…

js

…

lib

…

menus

fix merge conflicts

2020-12-18 19:28:38 +00:00

methods

Merged in feature/PMCORE-2314 (pull request #7652)

2020-12-19 02:23:49 +00:00

plugins

…

skinEngine

…

src

Merged in feature/PMCORE-2314-PQ (pull request #7658)

2020-12-19 00:44:55 +00:00

templates

PMCORE-2602

2020-12-19 01:52:57 +00:00

xmlform

…

gulliver-win.bat

…

PmBootstrap.php

…