Merge branch 'master' into develop

All this pulls in is disabling Google Analytics in production. I wanted
to get the branches back in sync.
This commit is contained in:
Danielle McLean 2018-01-29 09:15:22 +11:00
commit a6a5264477
Signed by untrusted user: 00dani
GPG key ID: 5A5D2D1AFF12EEC5

View file

@ -23,5 +23,3 @@ STATIC_URL = 'https://cdn.00dani.me/'
MEDIA_URL = STATIC_URL + 'media/' MEDIA_URL = STATIC_URL + 'media/'
META_SITE_DOMAIN = '00dani.me' META_SITE_DOMAIN = '00dani.me'
META_FB_APPID = '145311792869199' META_FB_APPID = '145311792869199'
GOOGLE_ANALYTICS_PROPERTY_ID = 'UA-109060843-1'