4 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	8851efaecf	updated translation resources	2014-08-21 14:12:15 +00:00