Skip to content
Commit af721118 authored by Klaas Freitag's avatar Klaas Freitag
Browse files

Merge branch '2.0' of github.com:owncloud/mirall into 2.0

parents 1790a128 0d5f2b5d
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment