7 Commits

Author	SHA1	Message	Date
michigg	0d452ec820	Merge branch 'master' of /media/data_1/www/gogs/gogs-repositories/michigg/ofu-app ... Conflicts: ofu_app/apps/events/utils/json_generator/jsons/events-fekide.json ofu_app/apps/food/utils/json_generator/jsons/cafete-erba.json ofu_app/apps/food/utils/json_generator/jsons/cafete-markus.json ofu_app/apps/food/utils/json_generator/jsons/mensa-austr.json ofu_app/apps/food/utils/json_generator/jsons/mensa-feki.json	2017-10-25 00:29:05 +02:00
michigg	84c60a9402	try fix positioning	2017-10-18 17:06:41 +02:00
michigg	04194aeac8	donar bus erweiterung	2017-10-17 21:51:00 +02:00
michigg	8226e4c2ad	donar search url fix for Feki, U.., Markushaus rooms	2017-10-09 02:08:01 +02:00
michigg	780e56bf10	donar search	2017-10-09 02:04:43 +02:00
michigg	a1d570c2fb	update views	2017-10-06 01:46:58 +02:00
michigg	81db0b2381	donar first model	2017-10-04 01:53:08 +02:00