projects / diaspy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 08f03d2 7f404fd)
Merge branch 'master' of https://github.com/Javafant/diaspora-api
authorMarek Marecki <triviuss@gmail.com>
Wed, 3 Jul 2013 18:49:26 +0000 (20:49 +0200)
committerMarek Marecki <triviuss@gmail.com>
Wed, 3 Jul 2013 18:49:26 +0000 (20:49 +0200)
1  2 
diaspy/models.py patch | diff1 | diff2 | blob | history

diff --cc diaspy/models.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.