Merge branch 'master' of ssh://192.168.100.6/repo/record

Conflicts:
	.gitignore
	asuzr/tables.py
	record/settings.py
This commit is contained in:
Anastasia
2015-06-10 22:28:38 +05:00
11 changed files with 76 additions and 17 deletions

1
.gitignore vendored
View File

@@ -3,3 +3,4 @@
db*
.directory
sketches/*
media/*