Paula Quispe 267c3627bf PMCORE-2524: Conflicts with develop

2020-12-09 12:26:20 -04:00

..

bin

PMCORE-2522

2020-12-08 16:06:11 -04:00

classes

PMCORE-2524: Conflicts with develop

2020-12-09 12:26:20 -04:00

config

PMCORE-2524: Conflicts with develop

2020-12-09 12:26:20 -04:00

content

PMCORE-2500

2020-12-07 22:42:37 +00:00

controllers

PMCORE-1176

2020-10-30 18:21:13 +00:00

data

PMCORE-2524: Conflicts with develop

2020-12-09 12:26:20 -04:00

includes

…

js

PMCORE-737

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

lib

…

menus

PMCORE-2500

2020-12-07 22:42:37 +00:00

methods

Remove comments

2020-12-07 23:00:00 +00:00

plugins

…

skinEngine

PMCORE-1976 Use of ampersand in password will produce wrong credentials error upon login.

2020-09-09 15:46:15 -04:00

src

PMCORE-2524: Conflicts with develop

2020-12-09 12:26:20 -04:00

templates

Solving conflicts updating with last changes in develop branch

2020-12-03 20:19:49 +00:00

xmlform

…

gulliver-win.bat

…

PmBootstrap.php

…