:Merge branch 'updating_calendar' of https://github.com/tmslav/dynamicweb into tmslav-updating_calendar

Browse source

Conflicts:
	dynamicweb/urls.py

...

This commit is contained in:

rascencio 2016-04-23 19:08:23 +02:00

parent 82377a2dcc 213f295394

commit f7ec020838

25 changed files with 6477 additions and 3800 deletions

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

Show stats Download patch file Download diff file Expand all files Collapse all files