TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ORIENT/modules/cms/lang
History
Stefan Talen 06890d711a Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 
Conflicts:
	modules/backend/behaviors/UserPreferencesModel.php
	modules/cms/classes/Controller.php
	modules/system/classes/CombineAssets.php
 		2014-10-16 18:44:18 +02:00
..
de Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-16 18:44:18 +02:00
en Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-16 18:44:18 +02:00
es-ar Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-16 18:44:18 +02:00
fa Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-16 18:44:18 +02:00
fr Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-16 18:44:18 +02:00
it Moved asset combiner to the system module 2014-10-15 08:09:46 +11:00
ja Moved asset combiner to the system module 2014-10-15 08:09:46 +11:00
nl Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-16 18:44:18 +02:00
pt-br Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-16 18:44:18 +02:00
ro Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-16 18:44:18 +02:00
ru Moved asset combiner to the system module 2014-10-15 08:09:46 +11:00
sv Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-16 18:44:18 +02:00
tr Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-16 18:44:18 +02:00