Merge branch 'feature/tags' of mowoe.com:reverend/lostplaces-backend into feature/tags

Merge branch 'master' into feature/tags
2020-09-01 21:33:07 +02:00 · 2020-08-27 17:17:39 +02:00 · 2020-08-27 17:16:20 +02:00 · 2020-08-27 17:00:41 +02:00
2 changed files with 1 additions and 2 deletions
--- a/1
+++ b/1
@ -11,7 +11,6 @@ django = "*"
 easy-thumbnails = "*"
 image = "*"
 django-widget-tweaks = "*"
 django-svg-icons = "*"
 django-taggit = "*"
 # Commented out to not explicitly specify Python 3 subversion.
--- a/lostplaces/lostplaces/settings.py
+++ b/lostplaces/lostplaces/settings.py
@ -44,7 +44,7 @@ INSTALLED_APPS = [
    'django.contrib.staticfiles',
    'easy_thumbnails',
    'widget_tweaks',
-	'taggit'
+    'taggit'
 ]
 MIDDLEWARE = [
Author	SHA1	Message	Date
reverend	2509c669f9	Merge branch 'feature/tags' of mowoe.com:reverend/lostplaces-backend into feature/tags	2020-09-01 21:33:07 +02:00
reverend	fc39b46c52	Merge branch 'master' into feature/tags	2020-08-27 17:17:39 +02:00
reverend	36744c65fb	Merge branch 'master' into feature/tags	2020-08-27 17:16:20 +02:00
reverend	8198c43451	Adding taggit to the dependencies	2020-08-27 17:00:41 +02:00