denise 78c81aa434 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel ... Conflicts: airtime_mvc/application/common/Database.php		2012-09-05 17:55:26 -04:00
..
common	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2012-09-05 17:55:26 -04:00
configs	cc-3936: added warning for metadata attributes that are not defined in constants.php	2012-08-27 14:03:22 -04:00
controllers	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2012-09-05 16:56:14 -04:00
forms	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2012-08-29 17:40:07 -04:00
layouts/scripts	CC-3933: Remove version number and date strings from login page footer, add robots.txt	2012-06-08 10:51:10 -04:00
logging	Added warning method. Changed some code to use it.	2012-08-27 14:51:35 -04:00
models	sexified code	2012-09-05 17:52:27 -04:00
validate	…
views	CC-4358: Calendar: Show Content: Undefined Index	2012-09-05 16:07:40 -04:00
Bootstrap.php	CC-4346: Prepared statements - part 2	2012-09-05 16:15:02 -04:00