Merge branch 'master' of https://github.com/FinalsClub/karmaworld
authorwilliambratches <williambratches@gmail.com>
Tue, 4 Mar 2014 19:01:58 +0000 (14:01 -0500)
committerwilliambratches <williambratches@gmail.com>
Tue, 4 Mar 2014 19:01:58 +0000 (14:01 -0500)
commit81e4726f753079e9e0f1815c3cfaddd16c7dd081
tree7fcbe8c64f764e4d80f4b8d86f4a89d74910226e
parentf26fce8c213347ec51441e5590c87ff1decc7801
parent36d9e6115017852f9adb6dd4d70494d20602ae1d
Merge branch 'master' of https://github.com/FinalsClub/karmaworld
karmaworld/urls.py