Merge branch 'develop' of https://github.com/skirsdeda/djangocms-blog into develop

Browse source

Conflicts:
	djangocms_blog/admin.py

...

This commit is contained in:

Tadas Dailyda 2014-11-30 22:26:02 +00:00

parent 16441b43f7 7f534c90df

commit b9e051ceab

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

Diff content is not available