]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
projects / thirdparty / knot-resolver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b171e5 971e194)
Merge branch 'cache-api-noglobal' into cache-memcached-wip
authorMarek Vavruša <marek.vavrusa@nic.cz>
Fri, 29 May 2015 16:25:50 +0000 (18:25 +0200)
committerMarek Vavruša <marek.vavrusa@nic.cz>
Fri, 29 May 2015 16:25:50 +0000 (18:25 +0200)

Trivial merge
Mirror of https://gitlab.nic.cz/knot/knot-resolver.git