projects / diaspy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 488d7ff 23fdf95)
Merge branch 'master' of https://github.com/Javafant/diaspora-api into contacts
authorMarek Marecki <triviuss@gmail.com>
Sun, 30 Jun 2013 21:29:25 +0000 (23:29 +0200)
committerMarek Marecki <triviuss@gmail.com>
Sun, 30 Jun 2013 21:29:25 +0000 (23:29 +0200)
1  2 
diaspy/people.py patch | diff1 | diff2 | blob | history

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