Merge branch 'license' of bitbucket.org:Air51/dokumentor_dev into license

Browse Source

Conflicts:
	project/customer/context_processors.py
	project/customer/models.py
	project/customer/utils.py

wtf?!

remotes/origin/license

Andrey 9 years ago

parent 4203cbada9 2de6ba2ee0

commit 1efd5af5f0

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available