Merge branch 'master' of github.com:ShareX/ShareX

This commit is contained in:
Jaex 2015-07-11 12:48:07 +03:00
commit dbce79ddef

View file

@ -111,7 +111,7 @@ ShareX supports the following destinations.
* [Amazon S3](http://aws.amazon.com/s3/)
* [ownCloud](https://owncloud.org)
* [MediaFire](https://www.mediafire.com)
* [Pomf](https://pomf.se)
* [MaxFile](https://maxfile.ro)
* [Gfycat](http://gfycat.com)
* [Pushbullet](https://www.pushbullet.com)
* [SendSpace](https://www.sendspace.com)
@ -169,4 +169,4 @@ Additional tools to make certain tasks more efficient.
* Index folder: Allows you to share the index of a folder contents by uploading the index of the selected folder as text, html or xml.
* FTP client: Opens a basic FTP client you interface for the currently configured FTP account.
* Tweet message: Allows you to post message to Twitter.
* Monitor test: Allows you to render different colors on the screen which provides you the opportunity to test for bleeding and dead pixels on LCD monitors.
* Monitor test: Allows you to render different colors on the screen which provides you the opportunity to test for bleeding and dead pixels on LCD monitors.