summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2018-07-09 01:58:49 +0200
committerMatthias Beyer <mail@beyermatthias.de>2018-07-09 01:58:49 +0200
commit991a5b3732bfb65b4f0b0105687b1e2fa5800e78 (patch)
tree0d24396e95825ebd308e43baf9828fa2327e1c53
parentd08a79e7c61addccf8f504cf86e58c1cf593215c (diff)
parent48aa0885bbdcc90bdeb35da483e50fb2e577720d (diff)
Merge branch 'off-of-github'
-rw-r--r--config.toml2
-rw-r--r--content/mailinglist.md14
2 files changed, 1 insertions, 15 deletions
diff --git a/config.toml b/config.toml
index cd607d1..cf7182d 100644
--- a/config.toml
+++ b/config.toml
@@ -71,7 +71,7 @@ description = "Don't panic"
email = "imag@imag-pim.org"
extracssfiles = [ "/css/tables.css" ] # In your `static` directory, add/remove files as necessary.
#faviconfile = "img/leaf.ico"
-github = "//github.com/matthiasbeyer/imag"
+#github = "//github.com/matthiasbeyer/imag"
highlightjs = true
lang = "en"
#linkedin = "//linkedin.com/in/you"
diff --git a/content/mailinglist.md b/content/mailinglist.md
index 97e9369..5bbb3ce 100644
--- a/content/mailinglist.md
+++ b/content/mailinglist.md
@@ -39,17 +39,3 @@ Also make sure
in the commit message if the commit was developed with others. We consider
this good attitude.
-All patches which are submitted via mail will end up in a github PR anyways
-(I will submit them as PR on github), so if you have a github account, send a PR
-rather than a patchset via mail.
-This will also shorten the feedback loop.
-
-## Contribute security-relevant patches
-
-As we run all patches through our
-[publicly available CI server at travis-ci.org](https://travis-ci.org/matthiasbeyer/imag)
-there is no point in sending such patch emails privately.
-You can, however, send me your patches directly so I can review them during
-the development process and as soon as I'm fine with the patchset I will push
-the changes to a PR on github.
-