Commit Graph

7 Commits

Author SHA1 Message Date
Anastasia
ec6fbc0607 Merge branch 'master' of ssh://192.168.100.6/repo/record
Conflicts:
	.gitignore
	asuzr/tables.py
	record/settings.py
2015-06-10 22:28:38 +05:00
Anastasia
7072eb1a39 изменен gitignore 2015-06-10 20:20:33 +05:00
35af39b263 Media в .gitignore
Добавил media/* в .gitignore
2015-06-10 17:54:14 +05:00
7221df75ae Settings was removed from gitignore 2015-06-10 17:16:44 +05:00
ca42f55ae0 Settings was remove 2015-06-01 15:20:11 +05:00
7e5c81aa33 Убрал из индекса папку с загруженными эскизами 2015-05-11 11:42:13 +05:00
Anastasia
4980326de3 Something 2015-05-09 21:34:56 +05:00