Paula Quispe 1859f910b9 conflicts

2017-03-10 16:55:43 -04:00

..

bin

+ CS

2017-03-01 10:24:08 -04:00

classes

conflicts

2017-03-10 16:55:43 -04:00

config

+ Add TAS_ID

2017-03-01 10:16:54 -04:00

content

HOR-2789 Audit Log translation

2017-02-24 11:13:23 -04:00

controllers

HOR-2773 we need to use G::is_https() for get the protocol

2017-02-23 15:14:44 -04:00

data

Merged in feature/HOR-2513 (pull request #5432)

2017-03-03 20:36:15 +00:00

includes

…

js

…

lib

…

menus

…

methods

Merged in feature/HOR-2805 (pull request #5512)

2017-03-10 18:46:24 +00:00

plugins

…

skinEngine

HOR-2773 we need to use G::is_https() for get the protocol

2017-02-23 15:14:44 -04:00

src

conflicts

2017-03-10 16:55:43 -04:00

templates

Merged in feature/HOR-2440 (pull request #5485)

2017-03-08 21:50:48 +00:00

test

…

xmlform

…

gulliver-win.bat

…

PmBootstrap.php

…