Merge branch 'v1' of https://github.com/sanoma/django-arctic into v1-…

…styling # Conflicts: # arctic/static/arctic/dist/assets/js/app.js # arctic/static/arctic/src/assets/scss/_custom.scss
dpgmediamagazines · Jul 10, 2017 · a2f46e4 · a2f46e4
2 parents 57dc4d5 + 5ead2a9
commit a2f46e4
Show file tree

Hide file tree

Showing 10 changed files with 158 additions and 204 deletions.
diff --git a/arctic/mixins.py b/arctic/mixins.py
@@ -201,7 +201,7 @@ def _return_fieldset(self, fieldset):
                 raise ImproperlyConfigured('The fieldset name does not '
                                            'support more than one | sign. '
                                            'It\'s meant to separate a '
-                                           'fieldset from it\'s '
+                                           'fieldset from its '
                                            'description.')
 
             title = fieldset