Merge branch '2.0'

orchestral · Aug 20, 2013 · c0aa139 · c0aa139
2 parents 13eba0a + f145f01
commit c0aa139
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
@@ -3,7 +3,6 @@
 # Ignore following folder/file.
 /build                          export-ignore
 /public/css/*.less              export-ignore
-/public/vendor/bootstrap/fonts  export-ignore
 /public/vendor/bootstrap/less   export-ignore
 /tests                          export-ignore
 /.coveralls.yml                 export-ignore