Denis V. Dedkov bcb8b5229a Merge branch 'dev' ...

Conflicts:
	asuzr/views.py

2015-07-16 21:36:22 +05:00

asuzr

Merge branch 'dev'

2015-07-16 21:36:22 +05:00

record

Редактирование

2015-07-16 21:34:16 +05:00

templates

Исправлены конфликты

2015-07-15 14:16:46 +05:00

.gitignore

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

2015-06-10 22:28:38 +05:00

manage.py

v_130415

2015-04-13 16:44:47 +05:00

Description

No description provided

710 KiB

Languages

Python 60.6%

HTML 39.4%