304 commits

Author	SHA1	Message	Date
Georg Ehrke	2b10371bde	fix merge conflicts	2012-04-26 18:08:49 +02:00
Georg Ehrke	3b9d283245	fix path in apps/files/templats/index.php	2012-04-23 16:25:07 +02:00
Georg Ehrke	4c2cf35050	fix merge conflicts	2012-04-22 13:19:12 +02:00
Georg Ehrke	45de7ad221	move files to app folder	2012-04-18 17:27:34 +02:00