]> git.ipfire.org Git - thirdparty/snapper.git/commitdiff
projects / thirdparty / snapper.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 68269bd aae057b)
Merge remote-tracking branch 'upstream/master' 155/head
authorArvin Schnell <aschnell@suse.de>
Mon, 2 Mar 2015 16:46:32 +0000 (17:46 +0100)
committerArvin Schnell <aschnell@suse.de>
Mon, 2 Mar 2015 16:46:32 +0000 (17:46 +0100)
Conflicts:
data/Makefile.am


Trivial merge
Mirror of https://github.com/openSUSE/snapper.git