projects / oweals / karmaworld.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a1690c 216a5b9)
Merge branch 'master' into quizzes
authorCharles Connell <charles@connells.org>
Wed, 5 Feb 2014 22:37:48 +0000 (17:37 -0500)
committerCharles Connell <charles@connells.org>
Wed, 5 Feb 2014 22:37:48 +0000 (17:37 -0500)
Conflicts:
reqs/common.txt

1  2 
karmaworld/settings/common.py patch | diff1 | diff2 | blob | history
karmaworld/urls.py patch | diff1 | diff2 | blob | history
reqs/common.txt patch | diff1 | diff2 | blob | history

diff --cc karmaworld/settings/common.py
Simple merge
diff --cc karmaworld/urls.py
Simple merge
diff --cc reqs/common.txt
index bf16cd22d2a5885aac1794765a59906241b247c7,08ec9c8673304298cdcd37bc5669b35b4328b45a..0dd59c422bf30ecbcfdd1eaf4bd8519d0d7f5cff
--- 1/reqs/common.txt
--- 2/reqs/common.txt
+++ b/reqs/common.txt
@@@ -21,4 -21,4 +21,5 @@@ html2tex
  django-allauth
  boto==2.6.0
  django-storages==1.1.4
 +git+https://github.com/Soaa-/django-nested-inlines.git
+ django-reversion
Unnamed repository; edit this file 'description' to name the repository.