4 Commits

Author	SHA1	Message	Date
michigg	51e7b14087	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/happyhourguide-fekide.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-03 02:14:19 +02:00
michigg	6d912c8a25	update ui	2017-10-03 02:13:55 +02:00
michigg	3a8d519315	haha	2017-10-03 02:10:58 +02:00
michigg	0fcb726f92	integrate data collectors in apps	2017-10-02 21:21:15 +02:00