Merge Request #83
← To merge requests
From
fix_master
into
master
Changing colab settings and auto settings for DB
Commits (24)
-
Added 19 new commits:
- 83ef0de7 - Set colab_settings for tests
- c72f8481 - Fixed pep8
- f1e92a83 - Fixed Gitlab tests
- 5498660e - Removing old deps from badger
- a2965d3c - remove legacy converse.js stuff
- 121feb9a - Removed i18n_model (no longer needed)
- 6c3931c0 - Reorganized deps on setup.py
- ef767871 - Removed django-mobile
- e373e29d - Readded tastypie
- f83576eb - Removed open-data api
- 87c02305 - Removed old TODO file
- 9c0fc2b4 - Moved voting to super_archives
- 70e66881 - Refactored vagrant install scripts
- f1daeea2 - Ignore whoosh_index
- aaaff48e - Added TODO
- 2f9c5931 - Added missing slash
- 6cb1ec46 - Removed old cron jobs left behind
- 60d43389 - Removed tastypie dep
- 9c651342 - Merge branch 'cleanup-old-deps' into fix_master