Merge branch 'bug/testing-1.6' of github.com:miceno/django-categories into bug/testing-1.6

Browse source

Conflicts:
	.travis.yml

...

This commit is contained in:

Orestes Sanchez 2015-08-12 18:31:15 +02:00

parent 3a238b17b5 8cb979c096

commit 8df7b65547

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