Merge branch 'master' of git.li-ra.net:swapoff/minesite

Алексей Дербушев
Commit 0361695b authored Mar 27, 2013 by Алексей Дербушев
Showing with 1 additions and 0 deletions
.gitignore
public/data/.gitignore
public/img/bkg.jpg
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ test.pl
 minecraft.conf
 .DS_Store
 minecraft.sqlite
+public/data
--- a/public/data/.gitignore
+++ b/public/data/.gitignore
--- a/public/img/bkg.jpg
+++ b/public/img/bkg.jpg