Jonas Franz e60b3f6e09 Merge branch 'master' into feat/approval ... # Conflicts: # vendor/vendor.json		2018-05-22 17:53:02 +02:00
..
code.gitea.io	Merge branch 'master' into feat/approval	2018-05-22 17:53:02 +02:00
github.com	…
golang.org/x	…
gopkg.in	…
strk.kbt.io/projects/go/libravatar	…