Rodrigo Quelca 847a0fb744 fix bad merge

2019-05-17 12:22:59 -04:00

..

bin

PMC-593

2019-04-11 17:51:27 -04:00

classes

solve conflicts

2019-05-17 11:16:18 -04:00

config

solve conflicts

2019-05-17 11:16:18 -04:00

content

PMC-760: Advanced Search Loader UI

2019-05-16 12:27:08 -04:00

controllers

solve conflicts

2019-05-17 11:16:18 -04:00

data

solve conflicts

2019-05-17 11:16:18 -04:00

includes

…

js

PMC-379-A

2019-04-10 11:02:51 -04:00

lib

…

menus

PMC-608

2019-03-22 12:44:12 -04:00

methods

PMC-371

2019-05-06 12:31:34 -04:00

plugins

…

skinEngine

PMC-60

2018-12-19 09:44:40 -04:00

src

solve conflicts

2019-05-17 11:16:18 -04:00

templates

fix bad merge

2019-05-17 12:22:59 -04:00

xmlform

Merged in bugfix/PMC-359 (pull request #6854)

2019-04-18 19:52:51 +00:00

gulliver-win.bat

…

PmBootstrap.php

…