aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into patch-3nodiscc2018-03-211-6/+4
|\
| * Merge pull request #1329 from mestaritonttu/patch-2nodiscc2018-03-211-0/+1
| |\
| | * Added Simple NixOS Mailservermestaritonttu2018-03-181-1/+1
| | * Added Simple NixOS Mailservermestaritonttu2018-03-051-0/+1
| * | Merge pull request #1344 from maluramichael/patch-1nodiscc2018-03-211-1/+1
| |\ \
| | * | The url of parrot translate has changedMichael Malura2018-03-211-1/+1
| | |/
| * | Merge pull request #1341 from mestaritonttu/patch-4nodiscc2018-03-211-1/+0
| |\ \
| | * | Remove IRCAnywheremestaritonttu2018-03-191-1/+0
| | |/
| * | Merge pull request #1338 from epoupon/fileshelter-updated-demo-urlnodiscc2018-03-211-1/+1
| |\ \
| | * | Updated demo URLemeric2018-03-171-1/+1
| | |/
| * | Merge pull request #1336 from mlescaudron/patch-1nodiscc2018-03-211-1/+0
| |\ \
| | * | Update README.mdLescaudron Mathieu2018-03-121-1/+0
| | |/
| * | Merge pull request #1328 from prahaladbelavadi/masternodiscc2018-03-211-1/+0
| |\ \
| | * | remove crushPrahalad Belavadi2018-03-051-1/+0
| | |/
| * | Merge pull request #1326 from tobiasd/friendicaNewURLnodiscc2018-03-211-1/+1
| |\ \ | | |/ | |/|
| | * Friendica project homepage has movedTobias Diekershoff2018-03-041-1/+1
| |/
* / Added Kiwi IRCmestaritonttu2018-03-051-0/+1
|/
* Merge pull request #1307 from Kickball/add-tileserver-glnodiscc2018-03-031-0/+1
|\
| * Merge branch 'master' into add-tileserver-glnodiscc2018-03-032-19/+30
| |\ | |/ |/|
* | Merge pull request #1325 from mide/rm-hack-chatnodiscc2018-03-031-1/+0
|\ \
| * | hack.chat is no longer maintained.Mark Ide2018-03-031-1/+0
* | | Merge pull request #1324 from cristoper/masternodiscc2018-03-031-0/+1
|\ \ \
| * | | Make requested changes to PRA. Cynic2018-02-271-1/+1
| * | | Add feedmixer to listA. Cynic2018-02-271-0/+1
| |/ /
* | | Merge pull request #1323 from Kickball/addGeekmarksnodiscc2018-03-031-0/+1
|\ \ \
| * | | Added Geekmarks to Bookmarks and Link Sharingn82252018-02-261-0/+1
| |/ /
* | | Merge pull request #1322 from disk0x/disk0x-fairnotfreenodiscc2018-03-031-1/+0
|\ \ \
| * | | Fair Source License is not a FLOSS licensedisk0x2018-02-261-1/+0
| |/ /
* | | Merge pull request #1321 from DrOfAwesomeness/DrOfAwesomeness-patch-1nodiscc2018-03-031-1/+1
|\ \ \
| * | | Rename Stash to BitBucket ServerMatthew East2018-02-261-1/+1
| |/ /
* | | Merge pull request #1320 from Tijndagamer/patch-1nodiscc2018-03-031-11/+11
|\ \ \
| * | | Fix several incorrect licensesMartijn2018-02-251-11/+11
| |/ /
* | | Merge pull request #1317 from golangci/masternodiscc2018-03-031-0/+1
|\ \ \
| * | | Add GolangCIgolangci2018-02-201-0/+1
* | | | Merge pull request #1316 from yrashk/patch-4nodiscc2018-03-031-0/+1
|\ \ \ \
| * | | | Add SIT Issue TrackerYurii Rashkovskii2018-02-181-0/+1
| |/ / /
* | | | Merge pull request #1310 from thebaer/patch-orangeforumnodiscc2018-03-031-0/+1
|\ \ \ \
| * | | | Add orangeforum demo linkMatt Baer2018-02-051-1/+1
| * | | | Merge remote-tracking branch 'upstream/master' into patch-orangeforumMatt Baer2018-02-051-2/+0
| |\| | |
| * | | | Add orangeforumMatt Baer2018-01-311-0/+1
* | | | | Merge pull request #1309 from MarkusMcNugen/patch-1nodiscc2018-03-031-0/+1
|\ \ \ \ \
| * | | | | shorten qbittorrent descriptionnodiscc2018-02-051-1/+1
| * | | | | Update README.mdMarkusMcNugen2018-02-051-1/+1
| * | | | | Add qBittorrent to Peer-to-peer filesharingMarkusMcNugen2018-02-051-0/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #1305 from vpp/masternodiscc2018-03-031-0/+1
|\ \ \ \ \
| * | | | | Node.js -> Nodejsnodiscc2018-02-031-1/+1
| * | | | | Add TimeOff.Management to HRM sectionPavlo Vodopyan2018-02-011-0/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #1303 from pengc99/patch-1nodiscc2018-03-031-0/+1
|\ \ \ \ \
| * | | | | Edited RedbirdAndrew Peng2018-01-301-1/+1
| * | | | | Add Redbird reverse proxyAndrew Peng2018-01-291-0/+1