Merge remote-tracking branch 'origin/2.6'

 Conflicts:
	CHANGELOG.md
	VERSION.cmake
	src/gui/MacOSXBundleInfo.plist
	src/gui/folderstatusmodel.h
	src/gui/settingsdialog.cpp

7 files changed, 16 insertions, 16 deletions

diff --git a/docs/fonts/mplus-1mn-bold.ttf b/docs/fonts/mplus-1mn-bold.ttf
new file mode 100644
index 000000000..5f26678ad
--- /dev/null
+++ b/docs/fonts/mplus-1mn-bold.ttf
diff --git a/docs/fonts/mplus-1mn-medium.ttf b/docs/fonts/mplus-1mn-medium.ttf
new file mode 100644
index 000000000..a85c66b40
--- /dev/null
+++ b/docs/fonts/mplus-1mn-medium.ttf
diff --git a/docs/fonts/mplus-1mn-regular.ttf b/docs/fonts/mplus-1mn-regular.ttf
new file mode 100644
index 000000000..394fb2f57
--- /dev/null
+++ b/docs/fonts/mplus-1mn-regular.ttf
diff --git a/docs/fonts/mplus-1mn-thin.ttf b/docs/fonts/mplus-1mn-thin.ttf
new file mode 100644
index 000000000..de41c15a8
--- /dev/null
+++ b/docs/fonts/mplus-1mn-thin.ttf
diff --git a/docs/fonts/mplus-1p-regular.ttf b/docs/fonts/mplus-1p-regular.ttf
new file mode 100644
index 000000000..b64dee269
--- /dev/null
+++ b/docs/fonts/mplus-1p-regular.ttf
diff --git a/docs/modules/ROOT/pages/installing.adoc b/docs/modules/ROOT/pages/installing.adoc
index 7d17edf77..58e407464 100644
--- a/docs/modules/ROOT/pages/installing.adoc
+++ b/docs/modules/ROOT/pages/installing.adoc
@@ -17,12 +17,12 @@ You will also find links to source code archives and older versions on the downl
 == System Requirements
 
 * Windows 7+
-* Mac OS X 10.7+ (*64-bit only*)
-* CentOS 6 & 7 (64-bit only)
-* Debian 8.0 & 9.0
-* Fedora 25 & 26 & 27
-* Ubuntu 16.04 & 17.04 & 17.10
-* openSUSE Leap 42.2 & 42.3
+* Mac OS X 10.10+ (64-bit only)
+* CentOS 6 & 7 & 8
+* Debian 8.0 & 9.0 & 10
+* Fedora 27 & 28 & 29 & 30 & 31
+* Ubuntu 18.04 & 19.04 & 19.10
+* openSUSE Leap 42.2 & 42.3 & 15.0 & 15.1 & 15.2
 
 NOTE: For Linux distributions, we support, if technically feasible, the latest 2 versions per platform and the previous Ubuntu https://wiki.ubuntu.com/LTS[LTS].
 
diff --git a/docs/resources/themes/owncloud-theme.yml b/docs/resources/themes/owncloud-theme.yml
index 2abde5a83..41fbcd0ee 100644
--- a/docs/resources/themes/owncloud-theme.yml
+++ b/docs/resources/themes/owncloud-theme.yml
@@ -5,20 +5,20 @@ font:
       normal: notoserif-regular.ttf
       bold: notoserif-bold.ttf
       italic: notoserif-italic.ttf
-      bold_italic: notoserif-bold_italic.ttf
+      bold_italic: notoserif-bolditalic.ttf
     # M+ 1mn supports ASCII and the circled numbers used for conums
     M+ 1mn:
-      normal: mplus1mn-regular-ascii-conums.ttf
-      bold: mplus1mn-bold-ascii.ttf
-      italic: mplus1mn-italic-ascii.ttf
-      bold_italic: mplus1mn-bold_italic-ascii.ttf
+      normal: mplus-1mn-regular.ttf
+      bold: mplus-1mn-bold.ttf
+      italic: mplus-1mn-thin.ttf
+      bold_italic: mplus-1mn-medium.ttf
     # M+ 1p supports Latin, Latin-1 Supplement, Latin Extended, Greek, Cyrillic, Vietnamese, Japanese & an assortment of symbols
     # It also provides arrows for ->, <-, => and <= replacements in case these glyphs are missing from font
     M+ 1p Fallback:
-      normal: mplus1p-regular-fallback.ttf
-      bold: mplus1p-regular-fallback.ttf
-      italic: mplus1p-regular-fallback.ttf
-      bold_italic: mplus1p-regular-fallback.ttf
+      normal: mplus-1p-regular.ttf
+      bold: mplus-1p-regular.ttf
+      italic: mplus-1p-regular.ttf
+      bold_italic: mplus-1p-regular.ttf
     Open Sans:
       normal: opensans-light.ttf
       bold: opensans-bold.ttf
@@ -49,7 +49,7 @@ base:
   font_size: 10.5
   line_height_length: 11
   line_height: $base_line_height_length / $base_font_size
-  #line_height: 1 
+  #line_height: 1
   font_size_large: round($base_font_size * 1.25)
   font_size_small: round($base_font_size * 0.85)
   font_size_min: $base_font_size * 0.75