projects / diaspy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 18fb9dc 52c871a)
Merge branch 'settings' into asacat
authorMarek Marecki <marekjm@taistelu.com>
Thu, 22 Aug 2013 14:19:07 +0000 (16:19 +0200)
committerMarek Marecki <marekjm@taistelu.com>
Thu, 22 Aug 2013 14:19:07 +0000 (16:19 +0200)

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