]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
projects / github / shaarli / Shaarli.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f6b3295 17e45b2)
Merge remote-tracking branch 'upstream/master'
authorMark Schmitz <kramred@gmail.com>
Thu, 7 Jun 2018 13:23:53 +0000 (14:23 +0100)
committerMark Schmitz <kramred@gmail.com>
Thu, 7 Jun 2018 13:23:53 +0000 (14:23 +0100)

Trivial merge
The personal, minimalist, super-fast, database free, bookmarking service - community repo