Commit 5e58068a authored by Benjamin Neff's avatar Benjamin Neff

Merge branch 'release/' into next-minor

parents 66367ccc e7d68319
......@@ -86,3 +86,6 @@ diaspora.iml
# Dolphin's directory's preferences files
# WebTranslateIt
Markdown is supported
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