Paula Quispe 9952cdb8ff Conflicts

2017-10-20 18:51:24 -04:00

..

bin

Merged in bugfix/HOR-3980 (pull request #6121)

2017-10-19 19:20:04 +00:00

classes

Conflicts

2017-10-20 18:51:24 -04:00

config

Merged in release/3.2.2 (pull request #6128)

2017-10-20 12:47:58 +00:00

content

Merged in bugfix/HOR-3841 (pull request #6126)

2017-10-19 22:03:27 +00:00

controllers

Merged in release/3.2.2 (pull request #6128)

2017-10-20 12:47:58 +00:00

data

Merged in release/3.2.2 (pull request #6128)

2017-10-20 12:47:58 +00:00

includes

…

js

…

lib

…

menus

HOR-3980

2017-10-18 16:02:20 -04:00

methods

Conflicts

2017-10-20 18:51:24 -04:00

plugins

HOR-3851

2017-10-10 12:33:25 -04:00

skinEngine

Merged in release/3.2.2 (pull request #6128)

2017-10-20 12:47:58 +00:00

src

Conflicts

2017-10-20 18:51:24 -04:00

templates

Merged in feature/FBI-2187 (pull request #6123)

2017-10-20 13:01:31 +00:00

xmlform

…

gulliver-win.bat

…

PmBootstrap.php

Merged in release/3.2.2 (pull request #6128)

2017-10-20 12:47:58 +00:00