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)
commit340266f81abb79b9f56af47eb840bd45e0879c43
treea2347c768c70b5de6151c4767d8b6a4a9d8af2fa
parent8e6a15e5f106f11298dea1d52d8c998e364bc634
parenta73c589b8a7e64480ef8ab6e8c86878f76f3ad39
Merge filepick.io into feature_vagrant_startup
.gitignore
karmaworld/settings/common.py