Merge branch 'master' of github.com:fnp/cas
[cas.git] / .gitignore
index 999c6ae..e3690f6 100755 (executable)
@@ -3,4 +3,5 @@
 localsettings.py
 /media
 /static
 localsettings.py
 /media
 /static
+*~