Merge branch 'ppt-gdrive' of https://github.com/FinalsClub/karmaworld into ppt-gdrive
authorSeth Woodworth <seth@sethish.com>
Wed, 26 Jun 2013 20:35:10 +0000 (20:35 +0000)
committerSeth Woodworth <seth@sethish.com>
Wed, 26 Jun 2013 20:35:10 +0000 (20:35 +0000)
commit5d63fe06eced72737f9f6724a652f2fa731c88bc
tree0943618d207ab2a34283610190d240075b0dba1a
parentfb6d70ff4df3ec05f547f7f7b8cd6ed2abb7b302
parent967b0218230563c0c62217c4b7f08840e5cceda3
Merge branch 'ppt-gdrive' of https://github.com/FinalsClub/karmaworld into ppt-gdrive

Conflicts:
karmaworld/apps/notes/gdrive.py
karmaworld/apps/notes/gdrive.py