Skip to content

Commit

Permalink
Merge branch 'andreicon-master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
  • Loading branch information
aviaryan committed Dec 8, 2016
2 parents d365368 + 636ba22 commit bc9cf04
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ But as already stated before, user account is not necessary to use the main feat
* [Programming Editors and IDEs](#programming-editors-and-ides)
* [Programming Tools](#programming-tools)
* [Communication](#communication)
* [Financial Tools](#financial-tools)
* [Music, Radio and Podcasts](#music-radio-and-podcasts)
* [Graphics, Image and Design](#graphics-image-and-design)
* [File Converters](#file-converters)
Expand Down Expand Up @@ -103,6 +104,13 @@ powershell, redis and lots others. Also has a good collection of IDEs for progra
* [Videolink2](https://videolink2.me/start) - Video conference online. Link generated, share link to invite other participants


### Financial Tools

* [ShapeShift.io](https://shapeshift.io) - Instant cryptocurrency conversion
* [Cryptrader.com](https://cryptrader.com) - Cryptocurrency price charts and indicators. Saving your settings requires an account
* [TradingView.com](https://tradingview.com) - Real-time information and market insights from various exchanges. Requires an account for saving settings


### Music, Radio and Podcasts

* [Podbay](http://podbay.fm/) - Listen to any podcast online, individual episodes can be downloaded
Expand Down

0 comments on commit bc9cf04

Please sign in to comment.