Commit Graph

8 Commits

Author SHA1 Message Date
Albert Santoni 21ea2a2933 Merge branch '2.5.x' into saas
Conflicts:
	airtime_mvc/application/models/Show.php
2014-11-13 14:22:25 -05:00
Albert Santoni 0681e80afd Regenerated the .po files 2014-11-13 13:56:47 -05:00
Albert Santoni a4ae1a7842 Translation update, and fixed bad merge in fr_FR 2014-11-11 18:19:49 -05:00
localizer a67397d0cf updated translation resources 2014-11-04 16:44:18 +00:00
localizer fb4699433b updated translation resources 2014-08-25 02:35:12 +00:00
localizer 8851efaecf updated translation resources 2014-08-21 14:12:15 +00:00
localizer 3a77931fcd updated translation resources 2014-07-31 10:12:13 +00:00
localizer 606560b187 updated translation resources 2014-07-29 09:56:25 +00:00