Sebastian Grewe 43bf7be200 [FIX] Merge conflict with development		2014-04-24 11:43:38 +02:00
..
site_assets	[UPDATE] jquery to version 2.1.0	2014-04-23 17:07:08 +02:00
.htaccess	[UPDATE] htaccess for docroot	2014-04-20 15:34:55 +02:00
favicon.ico	Various Fixes	2014-03-01 17:57:43 -07:00
index.php	[MOVED] Removed include and templates from public [TESTING]	2014-04-20 15:34:55 +02:00