summaryrefslogtreecommitdiffstats
path: root/makefu/5pkgs/devpi
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-05-16 23:32:10 +0200
committertv <tv@krebsco.de>2017-05-16 23:32:10 +0200
commit1181cd442425f16ac4f8debdf391fe9111715b17 (patch)
treeffa332199ba334d4c79b7e0e995a0ece45f588f3 /makefu/5pkgs/devpi
parent015649b9b32c39d1f1c90ebba8d9aadb733ba8b8 (diff)
parent514dda7d1ea2757f0989cb5dcb20d49a5e29a76f (diff)
parentf27676c5ea34a8d400988027e326c7022914bcf0 (diff)
Merge remote-tracking branches 'gum/master' and 'prism/master'