Commit 346e7a32 authored by Albert Astals Cid's avatar Albert Astals Cid

Merge remote-tracking branch 'origin/Applications/15.08'

Conflicts:
	VERSION
	core/document.cpp
	core/version.h
parents ba28b64a e2b5bc54
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