alekseybobkov cf0224c2e8 Merge branch 'develop' into builder-ui ... Conflicts: modules/backend/assets/css/october.css		2015-07-08 21:11:08 -07:00
..
backend	Merge branch 'develop' into builder-ui	2015-07-08 21:11:08 -07:00
cms	Update of FRENCH Translation for OctoberCMS - thanks @Galixte	2015-07-04 10:36:32 +10:00
system	Merge branch 'develop' into builder-ui	2015-07-08 21:11:08 -07:00