TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ORIENT/modules/backend/lang/en
History
Samuel Georges a548d6ee56 Merge remote-tracking branch 'remotes/origin/stable' into develop 
Conflicts:
	modules/backend/lang/en/lang.php
	modules/backend/lang/fr/lang.php
 		2016-04-01 13:00:32 +11:00
..
lang.php Merge remote-tracking branch 'remotes/origin/stable' into develop 2016-04-01 13:00:32 +11:00