Merge pull request #670 from jangernert/master

Do a 2.1 (or 3.0) release
jangernert · May 6, 2018 · 61f6331 · 61f6331
2 parents eef152a + 0741dd6
commit 61f6331
Show file tree

Hide file tree

Showing 1,583 changed files with 65,198 additions and 80,886 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,16 @@
+root = true
+
+[*]
+indent_style = tab
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.yml]
+indent_style = space
+indent_size = 2
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 build/
+builddir/
 feedreader.service
 feedreader.desktop
 feedreader-autostart.desktop
@@ -8,4 +9,4 @@ data/org.gnome.FeedReader-autostart.desktop
 data/org.gnome.FeedReader.desktop
 data/org.gnome.FeedReader.Daemon.service
 data/org.gnome.FeedReader.appdata.xml
-*.po~
+*.po~
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "data/GrabberConfig"]
+	path = data/GrabberConfig
+	url = https://github.com/fivefilters/ftr-site-config
+    branch = master
diff --git a/CMakeLists.txt b/CMakeLists.txt