diff options
author | Tom Willemsen | 2012-07-09 19:16:54 +0000 |
---|---|---|
committer | Tom Willemsen | 2012-07-09 19:16:54 +0000 |
commit | 72d124100d3fc4fb7ee9ada43385867b0c171a4d (patch) | |
tree | 8df784474eb8519032eefcc4e8f92f2dd009ebcc /.config/newsbeuter | |
parent | 8b1b423d0ae8e3b899658b05ae4ecb1c430b618f (diff) | |
parent | 65dee41a9237a67db713b2bc1bdbcc8a2cec6f67 (diff) | |
download | dotfiles-72d124100d3fc4fb7ee9ada43385867b0c171a4d.tar.gz dotfiles-72d124100d3fc4fb7ee9ada43385867b0c171a4d.zip |
Merge remote-tracking branch 'ryuslash/master' into phoenix
Conflicts:
.config/fish/config.fish
.xinitrc
Diffstat (limited to '.config/newsbeuter')
-rw-r--r-- | .config/newsbeuter/urls | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls index 37bf399..e06f216 100644 --- a/.config/newsbeuter/urls +++ b/.config/newsbeuter/urls @@ -42,6 +42,7 @@ http://feeds.feedburner.com/FalloutTutorials devel http://www.devarticles.com/rss.xml devel http://www.script-tutorials.com/feed/rss/ http://news.ycombinator.com/rss +https://www.djangoproject.com/rss/community/q-and-a/ #-----[ Linux and FLOSS ]--------------------------------------------- # http://www.reddit.com/r/commandline/.rss linux @@ -134,7 +135,6 @@ http://feeds.feedburner.com/basiccomic #-----[ Misc ]-------------------------------------------------------- http://wallbase.cc/rss misc http://www.mailinator.com/rss.jsp?email=ryuslash misc -http://rss.slashdot.org/Slashdot/slashdot misc # http://www.reddit.com/r/unixporn/.rss misc |