Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Mon, 22 Jun 2015 12:47:19 +0000 (14:47 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 22 Jun 2015 12:47:19 +0000 (14:47 +0200)
commit2197f3580b8ad8e1fccc31269e735aaffe6f308f
tree273f7702813d0dde1b9390f659329f690eac78b3
parent545290ae7026262d434ec27cea2ed0a7f5093b6e
parent4c21e83ff511623983fee64bef38a83f3424eabe
Merge branch '2.0'

Conflicts:
package.xml
files/lib/system/attachment/ConversationMessageAttachmentObjectType.class.php