projects / diaspy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66e4433 b4da66a)
Merge branch 'devel' into messages
authorMarek Marecki <marekjm@taistelu.com>
Sat, 24 Aug 2013 13:25:43 +0000 (15:25 +0200)
committerMarek Marecki <marekjm@taistelu.com>
Sat, 24 Aug 2013 13:25:43 +0000 (15:25 +0200)
1  2 
diaspy/__init__.py patch | diff1 | diff2 | blob | history

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