Paula Quispe 5b6c2927e4 Merged in bugfix/PMC-985 (pull request #6988) ...

PMC-985

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>

2019-07-22 19:20:02 +00:00

..

bin

Fixing conflict with PMC-852

2019-07-22 12:05:21 -04:00

classes

Fixing conflict with PMC-852

2019-07-22 12:05:21 -04:00

config

Fixing conflict with PMC-852

2019-07-22 12:05:21 -04:00

content

PMC-985

2019-07-22 15:04:57 -04:00

controllers

PMC-985

2019-07-22 15:04:57 -04:00

data

Merged in bugfix/PMC-985 (pull request #6988)

2019-07-22 19:20:02 +00:00

includes

…

js

…

lib

…

menus

…

methods

PMC-985

2019-07-22 15:04:57 -04:00

plugins

…

skinEngine

…

src

Merged in bugfix/PMC-985 (pull request #6988)

2019-07-22 19:20:02 +00:00

templates

PMC-980 Merge remote-tracking branch 'upstream/feature/PMC-43' into bugfix/PMC-980

2019-07-22 11:24:00 -04:00

xmlform

…

gulliver-win.bat

…

PmBootstrap.php

…