qronald ee1dc51c25 resolv conflict

2017-05-25 13:38:22 -04:00

..

bin

Merged in bugfix/HOR-3275 (pull request #5682)

2017-05-25 17:05:42 +00:00

classes

Merged in bugfix/HOR-3275 (pull request #5682)

2017-05-25 17:05:42 +00:00

config

Merged in feature/HOR-3070 (pull request #5630)

2017-05-12 12:00:07 +00:00

content

Merged in bugfix/HOR-2909 (pull request #5683)

2017-05-24 19:51:02 +00:00

controllers

Merged in bugfix/HOR-2873 (pull request #5567)

2017-05-16 12:14:28 +00:00

data

Merged in bugfix/HOR-2909 (pull request #5683)

2017-05-24 19:51:02 +00:00

includes

…

js

…

lib

…

menus

HOR-3184

2017-05-08 11:11:16 -04:00

methods

Merged in bugfix/HOR-3275 (pull request #5682)

2017-05-25 17:05:42 +00:00

plugins

…

skinEngine

Merged in bugfix/FBI-1655 (pull request #5611)

2017-05-04 12:37:57 +00:00

src

resolv conflict

2017-05-25 13:38:22 -04:00

templates

Merged in bugfix/HOR-2067 (pull request #5549)

2017-05-25 17:05:09 +00:00

test

…

xmlform

HOR-2909 improvement

2017-05-19 09:06:35 -04:00

gulliver-win.bat

…

PmBootstrap.php

…