Merge branch 'master' of ssh://192.168.100.6/repo/record
Conflicts: .gitignore asuzr/tables.py record/settings.py
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -3,3 +3,4 @@
|
||||
db*
|
||||
.directory
|
||||
sketches/*
|
||||
media/*
|
||||
|
||||
Reference in New Issue
Block a user