Merge branch 'hotfix-1.2.1'

Pete · Pete · commit 5b849ad5db38 · 2015-08-19T16:57:09.000+10:00
diff --git a/.gitattributes b/.gitattributes
@@ -73,3 +73,12 @@
 *.snk 	-text -diff
 *.cub 	-text -diff
 *.wixlib	-text -diff
+
+# fonts
+*.eot binary
+*.ttf binary 
+*.woff binary
+*.otf binary
+
+# flash 
+*.swf binary
