projects / diaspy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dead87b 1659dc9)
Merge branch 'cnngimenez-master'
authorMarek Marecki <marekjm@ozro.pw>
Sun, 23 Apr 2017 12:27:38 +0000 (14:27 +0200)
committerMarek Marecki <marekjm@ozro.pw>
Sun, 23 Apr 2017 12:27:38 +0000 (14:27 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.