Paula Quispe 309261fd29 Solving conflicts

2020-06-12 17:35:24 -04:00

..

bin

PMCORE-1323 Remove the possibility of change the memory_limit

2020-05-25 17:11:23 -04:00

classes

Solving conflicts

2020-06-12 17:35:24 -04:00

config

Revert "PMCORE-1542 (pull request #7355)"

2020-06-08 20:21:26 +00:00

content

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

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

controllers

PMCORE-1323 Remove the possibility of change the memory_limit

2020-05-25 17:11:23 -04:00

data

Merged in bugfix/PMCORE-1373 (pull request #7336)

2020-05-21 15:29:40 +00:00

includes

…

js

…

lib

…

menus

PMCORE-542

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

methods

Solving conflicts

2020-06-12 17:35:24 -04:00

plugins

PMC-1445 Update gitignore file

2019-11-28 16:32:15 -04:00

skinEngine

…

src

Solving conflicts

2020-06-12 17:35:24 -04:00

templates

Merged in bugfix/PMCORE-1323 (pull request #7347)

2020-06-11 16:12:19 +00:00

xmlform

…

gulliver-win.bat

…

PmBootstrap.php

PMCORE-1323 Remove the possibility of change the memory_limit

2020-05-25 17:11:23 -04:00