projects / diaspy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1530cc8 ec27a0a)
Merge branch 'master' into search
authorMarek Marecki <triviuss@gmail.com>
Sun, 7 Jul 2013 16:16:42 +0000 (18:16 +0200)
committerMarek Marecki <triviuss@gmail.com>
Sun, 7 Jul 2013 16:16:42 +0000 (18:16 +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.