Merge remote-tracking branch 'origin/1.8'
authorDaniel Molkentin <danimo@owncloud.com>
Fri, 13 Mar 2015 13:03:03 +0000 (14:03 +0100)
committerDaniel Molkentin <danimo@owncloud.com>
Fri, 13 Mar 2015 13:03:03 +0000 (14:03 +0100)
commit457f9b587d684f063084df3a0346d04a997391a4
tree4823983dd69a4250e5c63131d3c097739493ef15
parent40cdbda31285d9090d8109b10b244aa4740a5891
parent09749e2c7f2a1203a6c96d870f113596b5cec7ec
Merge remote-tracking branch 'origin/1.8'

Conflicts:
src/gui/sharedialog.cpp
src/gui/sharedialog.h
src/gui/sharedialog.cpp
src/gui/sharedialog.h