Sebastian Grewe b6aa1cbc66 Merge branch 'development' into bootstrap		2014-03-25 09:32:36 +01:00
..
classes	Merge branch 'development' into bootstrap	2014-03-25 09:32:36 +01:00
config	Merge branch 'development' into bootstrap	2014-03-25 09:32:36 +01:00
lib	[FIX] mpos compatibility for icons in navigation	2014-03-10 09:36:50 +01:00
pages	Merge branch 'development' into bootstrap	2014-03-25 09:32:36 +01:00
smarty/libs	Various Fixes	2014-03-01 17:57:43 -07:00
admin_checks.php	Merge branch 'development' into bootstrap	2014-03-11 21:55:24 +01:00
autoloader.inc.php	[MERGE] Fix merge conflict	2014-03-19 17:24:18 +01:00
bootstrap.php	Update bootstrap.php	2014-03-23 11:52:13 -04:00
database.inc.php	Various Fixes	2014-03-01 17:57:43 -07:00
smarty_globals.inc.php	Merge branch 'development' into bootstrap	2014-03-25 09:32:36 +01:00
smarty.inc.php	Various Fixes	2014-03-01 17:57:43 -07:00
version.inc.php	Merge branch 'development' into bootstrap	2014-03-21 16:01:03 +01:00