Merge remote-tracking branch 'origin/master' into ops_dev
# Conflicts: # requirements.txt
Showing
This diff is collapsed.
This diff is collapsed.
File added
deb_requirements.txt
0 → 100644
ibtiff4-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev python-tk | ||
\ No newline at end of file |
... | ... | @@ -18,3 +18,5 @@ itsdangerous==0.24 |
python-gssapi==0.6.4 | ||
tornado==4.4.2 | ||
eventlet==0.19.0 | ||
unicodecsv==0.14.1 | ||
django-filter==1.0.0 |
rpm_requirements.txt
0 → 100644
libtiff-devel libjpeg-devel libzip-devel freetype-devel lcms2-devel libwebp-devel tcl-devel tk-devel | ||
\ No newline at end of file |
utils/clean_migrations.sh
0 → 100755
utils/init_db.sh
0 → 100755
utils/make_fake_json.sh
0 → 100644
utils/make_init_json.sh
0 → 100644
utils/make_migrations.sh
0 → 100755
Please
register
or
sign in
to comment