projects / oweals / karmaworld.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e6a15e a73c589)
Merge filepick.io into feature_vagrant_startup
authorBryan <btbonval@gmail.com>
Tue, 17 Dec 2013 06:34:33 +0000 (01:34 -0500)
committerBryan <btbonval@gmail.com>
Tue, 17 Dec 2013 06:34:33 +0000 (01:34 -0500)
1  2 
.gitignore patch | diff1 | diff2 | blob | history
karmaworld/settings/common.py patch | diff1 | diff2 | blob | history

diff --cc .gitignore
Simple merge
diff --cc karmaworld/settings/common.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.