This repository has been archived on 2019-10-13. You can view files and clone it, but cannot push or open issues or pull requests.

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

..

jsons

Merge branch 'master' of /media/data_1/www/gogs/gogs-repositories/michigg/ofu-app

2017-10-25 00:29:05 +02:00

__init__.py

integrate data collectors in apps

2017-10-02 21:21:15 +02:00

controller_json_events.py

integrate data collectors in apps

2017-10-02 21:21:15 +02:00