merge with vichan-gold

This commit is contained in:
Czterooki 2013-07-20 00:19:08 -04:00
commit aef4425592
72 changed files with 3508 additions and 429 deletions

2
.gitignore vendored
View file

@ -14,7 +14,7 @@
/templates/cache
# other stuff
.DS_Store?
.DS_Store
thumbs.db
Icon?
Thumbs.db