Merge branch 'master' into tt-rss/dateError

This commit is contained in:
fanteik 2017-12-13 23:10:52 +01:00
commit 8184b8c31b
4 changed files with 4 additions and 4 deletions

View File

@ -15,7 +15,7 @@ Welcome to RSS Guard website. You can find here basic information.
RSS Guard is simple, light and easy-to-use RSS/ATOM feed aggregator developed using Qt framework which supports online feed synchronization.
#### You can support this project via donations:
* [PATREON](https://www.patreon.com/martinrotter),
* [LIBERAPAY](https://liberapay.com/martinrotter),
* [PAYPAL](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XMWPLPK893VH4).
#### See [Wiki](https://github.com/martinrotter/rssguard/wiki) for more information about features, download links and other stuff.

@ -1 +1 @@
Subproject commit ae7084718c41afc01919779e58cd449e0eebd401
Subproject commit 4a01edaec7d67d3b2ae81aeea2a3c876216fbab8

View File

@ -65,7 +65,7 @@ APP_URL_ISSUES = "https://github.com/martinrotter/rssguard/issues
APP_URL_ISSUES_NEW = "https://github.com/martinrotter/rssguard/issues/new"
APP_URL_WIKI = "https://github.com/martinrotter/rssguard/wiki"
APP_USERAGENT = "RSS Guard/$$APP_VERSION (github.com/martinrotter/rssguard)"
APP_DONATE_URL = "https://goo.gl/YFVJ0j"
APP_DONATE_URL = "https://liberapay.com/martinrotter"
APP_WIN_ARCH = "win64"
isEmpty(PREFIX) {

View File

@ -525,7 +525,7 @@
</action>
<action name="m_actionDonate">
<property name="text">
<string>&amp;Donate via PayPal</string>
<string>&amp;Donate...</string>
</property>
<property name="shortcut">
<string notr="true"/>