Dheeyi William c487e2cde0 Merge remote-tracking branch 'upstream/3.1' into HOR-1007 ...

Conflicts:
	gulliver/system/class.rbac.php
	rbac/engine/data/mysql/insert.sql

2016-06-15 09:07:51 -04:00

..

classes

HOR-474 "Asignacion de un rol a usuarios tarda demasiado " SOLVED

2016-03-21 12:22:54 -04:00

config

HOR-374

2016-03-03 16:12:43 -04:00

data/mysql

Merge remote-tracking branch 'upstream/3.1' into HOR-1007

2016-06-15 09:07:51 -04:00