Julio Cesar Laura Avendaño 11c6a64ee0 Solving conflicts merginf with last merge in develop branch

2020-11-25 13:18:20 +00:00

..

bin

Solving conflicts merginf with last merge in develop branch

2020-11-25 13:18:20 +00:00

classes

Solving conflicts merginf with last merge in develop branch

2020-11-25 13:18:20 +00:00

config

Solving conflicts merginf with last merge in develop branch

2020-11-25 13:18:20 +00:00

content

Fixed issue with translation.en file

2020-11-16 14:40:50 +00:00

controllers

PMCORE-1176

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

data

Solving conflicts merginf with last merge in develop branch

2020-11-25 13:18:20 +00:00

includes

HOR-3768

2017-08-22 14:37:54 -04:00

js

PMCORE-737

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

lib

…

menus

PMCORE-1789

2020-07-09 20:13:49 +00:00

methods

Solving conflicts merginf with last merge in develop branch

2020-11-25 13:18:20 +00:00

plugins

PMC-1445 Update gitignore file

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

skinEngine

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

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

src

Solving conflicts merginf with last merge in develop branch

2020-11-25 13:18:20 +00:00

templates

PMCORE-1176

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

xmlform

Conflicts

2019-09-12 15:10:46 -04:00

gulliver-win.bat

…

PmBootstrap.php

PMCORE-1323 Remove the possibility of change the memory_limit

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