Skip to content
Commit 1527dc07 authored by Patrik Dufresne's avatar Patrik Dufresne
Browse files

Merge branch 'develop/cherrypy16' into 'master' 

Develop/cherrypy16

See merge request pdsl/rdiffweb!3
parents a15b36b8 48d00fcc
Pipeline #144874201 passed with stages
in 32 minutes and 47 seconds