Julio Cesar Laura Avendaño ec443aac1b Fix conflicts merging to develop

2020-05-08 14:40:24 +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

Revert "PMCORE-1129 (pull request #7298)"

2020-04-16 14:21:42 +00:00

config

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

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

content

Solving conflict in workflow/engine/content/languages/translation.en

2020-04-24 22:45:18 +00:00

controllers

PMCORE-631

2020-04-14 11:10:46 -04:00

data

Solving conflict in workflow/engine/content/languages/translation.en

2020-04-24 22:45:18 +00:00

includes

…

js

…

lib

…

menus

PMCORE-542

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

methods

Merged in release/3.4.11 (pull request #7330)

2020-04-30 18:54:05 +00:00

plugins

…

skinEngine

…

src

Fix conflicts merging to develop

2020-05-08 14:40:24 +00:00

templates

Solving conflict in workflow/engine/content/languages/translation.en

2020-04-24 22:45:18 +00:00

xmlform

…

gulliver-win.bat

…

PmBootstrap.php

…