2 Commits

Author	SHA1	Message	Date
Jacob Neplokh	c4e8211687	Change ownCloud reference to Nextcloud ... Signed-off-by: Jacob Neplokh <me@jacobneplokh.com>	2020-07-19 11:36:34 -07:00
Christian Kamm	4fa6fff1a9	Doc: Explaining conflict files and resolving them #6396	2018-07-03 10:18:20 +02:00