projects / diaspy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cd18cc8 1e192d0)
Merge branch 'users'
authorMarek Marecki <triviuss@gmail.com>
Fri, 5 Jul 2013 23:13:14 +0000 (01:13 +0200)
committerMarek Marecki <triviuss@gmail.com>
Fri, 5 Jul 2013 23:13:14 +0000 (01:13 +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.