mgoetz/basta-server
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
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.
basta-server/ofu_app/apps/events/utils/json_generator
History
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
..
jsons
Merge branch 'master' of /media/data_1/www/gogs/gogs-repositories/michigg/ofu-app
2017-10-03 02:14:19 +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