]> git.ipfire.org Git - people/jschlag/nitsi.git/commitdiff
projects / people / jschlag / nitsi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7940bc8 45bc861)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/jschlag/nitsi
authorJonatan Schlag <jonatan.schlag@ipfire.org>
Sat, 9 Jun 2018 11:47:35 +0000 (13:47 +0200)
committerJonatan Schlag <jonatan.schlag@ipfire.org>
Sat, 9 Jun 2018 11:47:35 +0000 (13:47 +0200)

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