Merge branch 'master' of github.com:moccu/django-omnibus · moccu/django-omnibus@5057fbf · GitHub

This repository has been archived by the owner on May 21, 2021. It is now read-only.

Commit

Merge branch 'master' of github.com:moccu/django-omnibus

Browse files

Conflicts:
	tox.ini

Loading branch information

EnTeQuAk committed Mar 27, 2014

2 parents e4ed559 + 33e1fee commit 5057fbf