Julio Cesar Laura Avendaño 33879b05ed Resolving new conflict with PMCORE-543

2020-04-13 14:04:37 +00:00

..

bin

PMCORE-1198:The columns in process list change for all users if any other user remove/hide the columns

2020-04-08 10:38:17 -04:00

classes

Merged in bugfix/PMCORE-1151 (pull request #7297)

2020-04-03 19:43:30 +00:00

config

Merged in feature/PMC-1332 (pull request #7136)

2020-02-03 10:07:05 -04:00

content

Solving conflicts with the last changes in develop branch

2020-02-27 13:23:51 -04:00

controllers

…

data

Solving conflicts with the last changes in develop branch

2020-02-27 13:23:51 -04:00

includes

…

js

…

lib

…

menus

PMCORE-542

2020-01-31 14:10:18 -04:00

methods

Resolving new conflict with PMCORE-543

2020-04-13 14:04:37 +00:00

plugins

…

skinEngine

…

src

Resolving new conflict with PMCORE-543

2020-04-13 14:04:37 +00:00

templates

Resolving new conflict with PMCORE-543

2020-04-13 14:04:37 +00:00

xmlform

…

gulliver-win.bat

…

PmBootstrap.php

…