Julio Cesar Laura Avendaño bb935e1637 Solving conflicts updating with last changes in develop branch

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

..

bin

Solving conflicts merginf with last merge in develop branch

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

classes

Solving conflicts updating with last changes in develop branch

2020-12-03 20:19:49 +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

…

js

…

lib

…

menus

…

methods

Solving conflicts updating with last changes in develop branch

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

plugins

…

skinEngine

…

src

Solving conflicts updating with last changes in develop branch

2020-12-03 20:19:49 +00: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

…