]> cloud.milkyroute.net Git - dolphin.git/commitdiff
projects / dolphin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f4c397 05de88f)
Merge branch 'master' into frameworks
authorEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Thu, 26 Feb 2015 13:38:55 +0000 (14:38 +0100)
committerEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Thu, 26 Feb 2015 13:38:55 +0000 (14:38 +0100)

Trivial merge