sintonia/airtime_mvc
Martin Konecny 0a198ae424 Merge branch '2.3.x' into 2.3.x-saas
Conflicts:
	airtime_mvc/application/models/User.php
2013-01-30 18:31:45 -05:00
..
application Merge branch '2.3.x' into 2.3.x-saas 2013-01-30 18:31:45 -05:00
build Added Czech and Brazilian Portuguese language options 2013-01-21 14:56:27 -05:00
library
locale Added Czech and Brazilian Portuguese language options 2013-01-21 14:56:27 -05:00
public Merge branch '2.3.x' into 2.3.x-saas 2013-01-30 18:31:45 -05:00
tests test commit 2012-10-29 19:19:48 -04:00