Skip to content
This repository was archived by the owner on Apr 16, 2023. It is now read-only.

Conversation

@meshy
Copy link
Owner

@meshy meshy commented Oct 21, 2014

No description provided.

@meshy
Copy link
Owner Author

meshy commented Oct 21, 2014

Ready for review

@meshy
Copy link
Owner Author

meshy commented Oct 21, 2014

(Possibly easier one commit at a time.)

@meshy meshy mentioned this pull request Oct 21, 2014
@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling b6d7754 on routes-app into 438bf6b on master.

@LilyFirefly
Copy link
Collaborator

Happy to merge after the conflict with #39 is fixed.

Conflicts:
	conman/nav_tree/tests/test_models.py
	conman/redirects/tests/test_handlers.py
	conman/redirects/tests/test_models.py
	conman/redirects/tests/test_views.py
@meshy
Copy link
Owner Author

meshy commented Oct 22, 2014

Updated

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling 94607a0 on routes-app into 1e3c711 on master.

LilyFirefly pushed a commit that referenced this pull request Oct 23, 2014
Rename nav_tree app to "routes"
@LilyFirefly LilyFirefly merged commit 2b63b24 into master Oct 23, 2014
@LilyFirefly LilyFirefly deleted the routes-app branch October 23, 2014 07:17
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants