Albert Santoni 8c9981a155 Merge branch '2.5.x' into 2.5.x-installer ... Conflicts: airtime_mvc/public/index.php		2015-06-16 10:37:06 -04:00
..
application	Merge branch '2.5.x' into 2.5.x-installer	2015-06-16 10:37:06 -04:00
build	Fixed everything about Airtime on Debian	2015-02-13 16:06:59 -05:00
library	Reverted commit mistakenly changing file modifiers to 755	2015-01-14 20:45:03 -05:00
locale	updated translation resources	2015-05-07 08:04:23 +00:00
public	Merge branch '2.5.x' into 2.5.x-installer	2015-06-16 10:37:06 -04:00
tests	CC-5986 - Fixed unit tests, removed unnecessary code from service execution files	2015-01-28 13:19:50 -05:00