Merge remote-tracking branch 'upstream/master'

Author: markotibold

.gitignore

@@ -1,10 +1,8 @@
-# Database content will be handled by fixtures
 *.db
-
-# These are normally defined globally
 *.pyc
 *~
 .*
+env
 
 # Accept these files in the repository
 !.gitignore

snippets/models.py

@@ -2,7 +2,7 @@
 from pygments.lexers import get_all_lexers
 from pygments.styles import get_all_styles
 from pygments.lexers import get_lexer_by_name
-from pygments.formatters import HtmlFormatter
+from pygments.formatters.html import HtmlFormatter
 from pygments import highlight
 
 LEXERS = [item for item in get_all_lexers() if item[1]]

snippets/serializers.py

@@ -14,7 +14,7 @@ class Meta:
 
 
 class UserSerializer(serializers.HyperlinkedModelSerializer):
-    snippets = serializers.ManyHyperlinkedRelatedField(view_name='snippet-detail')
+    snippets = serializers.HyperlinkedRelatedField(view_name='snippet-detail', many=True)
 
     class Meta:
         model = User