Commit Graph

169 Commits

Author SHA1 Message Date
Jack Chou
801e7a17d1
Updated Bitwarden logo (#1968)
* Updated Bitwarden logo in assets/img/svg/3rd-party folder

* Updated dimensions in accordance to contributiing guidelines

* Optimize SVG in Inkscape

Co-authored-by: Daniel Gray <dng@disroot.org>
2020-07-02 10:53:59 -07:00
blacklight447
5c4eb096e1
De-list/Remove Keybase (#1951)
* Update instant-messenger.html

* Update teamchat.html

See #1951

* Remove Keybase

* Remove Keybase References

Co-authored-by: Freddy Marsden <hello@freddym.xyz>
Co-authored-by: Jonah Aragon <jonah@triplebit.net>
2020-06-30 17:14:17 -07:00
nitrohorse
607b9d73d5
Update DNS page with card-based client recommendations (#1900)
* WIP: Add icons

* Add Google Play and App Store links

* Add tentative Android logo

* Update Unbound logo, text cleanup, formatting

* Add banner for anonymized dns, more cleanup

* Some text clarification

* Add "https:" for local development

* Update terms formatting and include anonymized dnscrypt

* Move terms section to bottom of page

* Add LibreDNS

* Update AdGuard hosting provider

* Add forum links

* Reword "terms" to "definitions"

* Add card for Stubby

* Add warning link to Android 9 card

* LibreDNS supports QNAME min
2020-06-04 09:00:31 -07:00
Jonah Aragon
a3e4379a94
Update sponsorship listings 2020-05-28 11:49:39 -05:00
Jonah Aragon
8bb3bf4c85
Update <head> 2020-05-12 16:07:55 -05:00
Jonah Aragon
03dd56bf59
Add browser recommendations 2020-05-12 14:05:51 -05:00
Jonah Aragon
fcc9986ab9
Import Firefox Privacy Post 2020-05-12 13:10:48 -05:00
Jonah Aragon
63e7b5d333
Add blog 2020-05-12 11:15:32 -05:00
Jonah Aragon
985a9ec84e
Add privacy section to homepage 2020-05-12 01:16:05 -05:00
Jonah Aragon
d91e27ce61
Add threat modeling information 2020-05-12 00:30:23 -05:00
Jonah Aragon
3986217030
Create basic layout 2020-05-11 22:59:21 -05:00
nitrohorse
16a49cfa20
Add additional VPN resource links (#1891) 2020-05-08 03:50:11 +00:00
Daniel Nathan Gray
946984d613
Add ClearURLs Addon (#1889) 2020-05-05 16:30:38 +00:00
Daniel Nathan Gray
513de75e05
Add SimpleLogin (#1890) 2020-05-05 16:28:41 +00:00
Daniel Nathan Gray
cdda746c00
Add temporary container solution (#1888) 2020-05-05 16:28:21 +00:00
Daniel Nathan Gray
720e458f93
Add canvasblocker as advanced addon (#1886) 2020-05-05 16:26:16 +00:00
Jonah Aragon
22d5325efc Restore cookie_autodelete.png 2020-04-28 23:34:56 -05:00
Jonah Aragon
52cef9ad93
Browser add-on cleanup (#1864) 2020-04-28 22:53:09 -05:00
Dan Arel
6614c9ce2b
Relist StartPage in Search Engines (#1592) 2020-04-28 21:15:41 -05:00
Daniel Nathan Gray
6f0cedfcc3
Fix canvas to be 384x128 (#1852) 2020-04-22 22:02:19 -07:00
Daniel Nathan Gray
99c686f3ac
New version of StartMail logo (dark) (#1851) 2020-04-22 00:10:59 -05:00
Jonah Aragon
a1ab2d2daa
Site Cleanup (#1840) 2020-04-20 18:38:19 -05:00
Daniel Nathan Gray
f1878a80eb
Re-add StartMail (#1830) 2020-04-19 05:53:43 +00:00
Daniel Nathan Gray
94629b75f7
Cleanup 2.0 instant messenger page (#1836) 2020-04-19 05:51:34 +00:00
Mikaela Suomalainen
4eae9a7fb7
assets: update signal.svg (#1826) 2020-04-13 02:18:59 +00:00
szTheory
a5ec15d5e9
Added ExifCleaner to the Metadata Removal Tools section on the Productivity Tools page (#1802)
* Added ExifCleaner to the Metadata Removal Tools section on the Productivity Tools page

* ExifCleaner logo: Convert PNG to SVG with vectorizer.io and export as optimized SVG using Inkscape.

* Remove redundent text

* Mention ExifTool

* Oops missing "

* Replace svg with one that isn't retarded

* Change canvas to 128x128 px

Co-authored-by: Daniel Nathan Gray <dng@disroot.org>
Co-authored-by: Dawid Potocki <dawid@dawidpotocki.com>
2020-03-27 12:19:36 +01:00
Daniel Nathan Gray
a4c14b9efb
Add 7zip, remove Peazip, Keka not FOSS (#1797) 2020-03-27 04:07:17 +00:00
Daniel Nathan Gray
4efdd0e27e
Add optimized version of Mailcow logo (#1743) 2020-03-01 13:15:49 +00:00
Daniel Nathan Gray
7244734051
New email section (#1672) 2020-03-01 12:06:06 +00:00
Jonah Aragon
b0db6a2c36 Update my profile 2020-02-03 13:31:04 -06:00
Dawid Potocki
e0346ac501 Adjust sponsorship layout (#1593)
* Fix SVG being black
    Adobe Illustrator SVGs have rendering problems on PTIO for unknown to
    me reasons. Inkscape works fine.
* Rewrite with plain Flexbox
    Nicer end-user experience than Bootstrap grid
2020-01-05 18:35:30 -06:00
Dawid Potocki
6caaf9eb3e
Replace GNU Social with Pleroma (#1607)
Closes #1281, #1282
2019-12-21 02:40:14 +00:00
Dawid Potocki
76b6bc7e88
Redo PC Live Operating Systems section (#1600)
Remove the following operating systems, because of described issues

KNOPPIX:
  - Site has optional HTTPS, so all links, will make you go back to HTTP
  - Source code distributed on ISOs, no online repositories/tarballs

Puppy Linux:
  - Site is only over HTTP
  - Looks like garbage

Tiny Core Linux:
  - Site is only over HTTP
  - Not really usable or useful
  - Looks like garbage

Add Debian and Fedora to Worth Mentioning PC Live Operating Systems,
since they are recommended as normal operating systems and support
LiveUSB.
2019-12-20 13:51:00 +00:00
Jonah
34c099ecab
Safing Sponsorship Spot 2019-12-17 15:02:41 -06:00
Dawid Potocki
d30a150016
Fix images on /providers/ and site favicons (#1568) 2019-12-05 18:39:33 +00:00
Dawid Potocki
d12c541701
Update PrivacyTools logo (#1566) 2019-12-04 19:46:17 +00:00
Dawid Potocki
eeaf642ee4 Fix /about/ page images (#1564) 2019-12-04 12:18:35 -06:00
Dawid Potocki
7fb5d206f5
Switch images to svgs, where possible (#1563)
Closes #1361, #1362
2019-12-04 15:35:20 +00:00
Daniel Nathan Gray
ac9b3fcec7
Move Bitmessage to peer-to-peer RTC. Move I2P-Bote to Self contained networks. Remove "email alternatives" page. (#1559)
- Move I2P-Bote to Self contained networks.
- Remove "email alternatives" page and nav item
2019-12-04 09:50:29 +00:00
Jonah Aragon
cace422247
Recommend Mailcow (#1545) 2019-12-01 15:54:15 -06:00
Dawid Potocki
bd9f7b4a83
Change website button from image to HTML (#1554) 2019-12-01 15:04:19 +00:00
Daniel Nathan Gray
084b92cd4a Remove neomailbox (#1553) 2019-12-01 06:01:21 +00:00
Daniel Nathan Gray
6fac5720a6
Refine instant messenger section (centralized, federated, peer to peer) (#1500) 2019-11-28 06:45:54 +00:00
Patrick
84fbe91361 Remove Wire (#1489)
https://blog.privacytools.io/delisting-wire/

* Remove Wire

* Delete wire.png

* Remove Wire security audit

* Remove Worth Mentioning

The only thing is Wire, which is being removed

* Remove Wire from do not use warning
2019-11-19 10:55:34 -06:00
Daniel Nathan Gray
bb329e9525 Update bio, profile pic and Mastodon for dngray (#1493) 2019-11-17 10:08:48 +00:00
Mikaela Suomalainen
9a156bc135 search-engines: delist startpage (#1410)
* search-engines: delist startpage

Resolves: #1409

* assets: rm StartPage.png

* search-engines.html: add a note on Startpage removal

Co-authored-by: Liz McIntyre <LizMcIntyre@users.noreply.github.com>

* Revert "search-engines.html: add a note on Startpage removal"

This reverts commit ff5ef961f1fb4ce34948ea046d85358c1e3ad6fe.
2019-11-12 16:20:18 -06:00
Jonah Aragon
4b60a4d211
Add team page (#1473)
* Add team page

* Add biographies

Co-Authored-By: nitrohorse <1514352+nitrohorse@users.noreply.github.com>

* Add links to navbar

* Add trai_dep's bio

* Add info about us and our mission

* Update bios

Co-Authored-By: Mikaela Suomalainen <mikaela@users.noreply.github.com>
Co-Authored-By: Dan Arel <danarel@users.noreply.github.com>

* Replace contact page with about us page

* Fix footer link

* Make up bios for the lazy team members

Plus, they are all more aesthetically pleasing for @danarel.

* Update bio

Co-Authored-By: Dawid Potocki <dpot@disroot.org>

* Update bio

Co-Authored-By: Dawid Potocki <dpot@disroot.org>

* Apply suggestions from code review

Co-Authored-By: Dawid Potocki <dpot@disroot.org>
Co-Authored-By: Mikaela Suomalainen <mikaela+git@mikaela.info>
2019-11-09 12:42:13 -06:00
Dawid Potocki
f4335e86dd
Replace Tor image button with proper font icon (#1470) 2019-11-06 23:04:34 +00:00
Dawid Potocki
3c74311aa8
Update self_contained_networks.html correctly to cardv2 (#1467)
* Fix margins
* Add platform links
* Update I2P logo
2019-11-06 00:37:58 +00:00
djoate
27329222d6 Delist Least Authority S4 (#1434)
* cloud-storage.html: delist Least Authority S4

* assets: remove S4.png
2019-10-29 15:19:40 -05:00
pbbob
5d57a6b37e Change Firefox logo (#1421) 2019-10-26 18:22:43 +00:00
Jonah Aragon
0ed008d71d RTC: List Riot as recommended & imrpove badges (#1392) 2019-10-11 02:24:58 +03:00
Dawid Potocki
b70af4899f Fix issues with dark theme (#1335)
Fixes #1318
2019-09-23 23:49:37 +03:00
Dawid Potocki
8c9542264f Remove Pydio (#1333)
Fixes #1331
2019-09-21 19:34:21 +00:00
Mikaela Suomalainen
910c44fa85 Delist Blokada, link to DNS clients & add anchor for them (#1325)
* delist Blokada

Resolves: #1123

* dns: add anchor "clients"
2019-09-19 19:35:43 +00:00
blacklight447
5d161c9ea8
[WIP] Browser overhaul. Browser section. (#1256)
* Browser overhaul, recommended browsers section

* Update _includes/sections/browser-recommendation.html

Co-Authored-By: Mikaela Suomalainen <mikaela+git@mikaela.info>

* Update _includes/sections/browser-recommendation.html

Co-Authored-By: Mikaela Suomalainen <mikaela+git@mikaela.info>

* Update _includes/sections/browser-recommendation.html

Co-Authored-By: Mikaela Suomalainen <mikaela+git@mikaela.info>

* Update _includes/sections/browser-recommendation.html

Co-Authored-By: Jonah Aragon <jonah@triplebit.net>

* Update browser-recommendation.html

Change Firefox browser to Firefox.
add warning to update system webview with Privacy Browser.

* Update browser-recommendation.html

changed Tor browser description in the android section to make it less redundent.

* Update browser-recommendation.html

removed some platforms to make it less cluttered.

* Update browser-recommendation.html

More cleaning up.

* Update _includes/sections/browser-recommendation.html

Co-Authored-By: Mikaela Suomalainen <mikaela+git@mikaela.info>

* Update _includes/sections/browser-recommendation.html

Co-Authored-By: Mikaela Suomalainen <mikaela+git@mikaela.info>

* Fix Privacy Browser's warning badge and format code nicely (#1275)

* Update browser-recommendation.html

expanded bromite description

* Update browser-recommendation.html

* Update browser-recommendation.html

* Update browser-recommendation.html

* Update browser-recommendation.html

* Update browser-recommendation.html

* Update browser-recommendation.html

* Update browser-recommendation.html

* Update browser-recommendation.html

* Update browser-recommendation.html

removed android 5 warning

* Update _includes/sections/browser-recommendation.html

Co-Authored-By: Dawid Potocki <dpot@disroot.org>

* Update _includes/sections/browser-recommendation.html

Co-Authored-By: Dawid Potocki <dpot@disroot.org>

* Update _includes/sections/browser-recommendation.html

Co-Authored-By: Dawid Potocki <dpot@disroot.org>

* Update _includes/sections/browser-recommendation.html

Co-Authored-By: Dawid Potocki <dpot@disroot.org>

* Update _includes/sections/browser-recommendation.html

Co-Authored-By: Dawid Potocki <dpot@disroot.org>

* Update _includes/sections/browser-recommendation.html

Co-Authored-By: nitrohorse <1514352+nitrohorse@users.noreply.github.com>

* Update _includes/sections/browser-recommendation.html

Co-Authored-By: nitrohorse <1514352+nitrohorse@users.noreply.github.com>

* Update _includes/sections/browser-recommendation.html

Co-Authored-By: nitrohorse <1514352+nitrohorse@users.noreply.github.com>

* Update browser-recommendation.html

* Update _includes/sections/browser-recommendation.html

Co-Authored-By: Dawid Potocki <dpot@disroot.org>

* Update _includes/sections/browser-recommendation.html

Co-Authored-By: Dawid Potocki <dpot@disroot.org>

* Update _includes/sections/browser-recommendation.html

Co-Authored-By: Dawid Potocki <dpot@disroot.org>

* Update _includes/sections/browser-recommendation.html

Co-Authored-By: Dawid Potocki <dpot@disroot.org>

* Update browser-recommendation.html

* Update browser-recommendation.html

* Update _includes/sections/browser-recommendation.html

Co-Authored-By: Dawid Potocki <dpot@disroot.org>

* Update browser-recommendation.html

* Update _includes/sections/browser-recommendation.html

Co-Authored-By: Dawid Potocki <dpot@disroot.org>

* Update _includes/sections/browser-recommendation.html

Co-Authored-By: Dawid Potocki <dpot@disroot.org>

* Update browser-recommendation.html

* Update _includes/sections/browser-recommendation.html

fine.

Co-Authored-By: Dawid Potocki <dpot@disroot.org>

* Update _includes/sections/browser-recommendation.html
2019-09-12 14:13:10 +00:00
nitrohorse
55866ffb45 Add Productivity Tools subsection; add MAT2 (#1270)
* Add MAT2

* Update source_code.md

* Update _includes/sections/productivity-tools.html

Co-Authored-By: Mikaela Suomalainen <mikaela+git@mikaela.info>
2019-09-06 18:16:10 +00:00
nitrohorse
d63474012a Replace DNSCrypt with DNSCrypt-Proxy (#1254)
* Replace DNSCrypt with DNSCrypt-Proxy

* Update source_code.md

* Add logo and forum link

* Remove redundant platform links

* Update _includes/sections/dns.html

Co-Authored-By: Mikaela Suomalainen <mikaela+git@mikaela.info>

* Update description
2019-09-03 08:23:46 +00:00
blacklight447
8b7107ce48
Add files via upload (#1263) 2019-09-02 15:15:08 +00:00
Dawid Potocki
2d7a8c9427
Remove white backgrounds, update and remove (not used) images (#1210) 2019-08-24 16:35:49 +00:00
Jonah Aragon
6a3476d891
Remove Brave (#1169)
* Remove Brave

* Delete Brave.png

* Update source_code.md
2019-08-18 17:41:17 -05:00
Jonah Aragon
970df97477
Reworked VPN Providers (#1174)
* Reworked VPN Providers

* Fix incorrect references

* Delete NordVPN.png
2019-08-17 16:49:07 -05:00
Jonah Aragon
37dc62ca41
Optimize images (#1157) 2019-08-17 16:44:58 -05:00
nitrohorse
92212dc83d
Update Password Managers page to cardv2 (#1170)
* Update Password Managers page to cardv2

* Fix KeePassXC description typos

* Remove Windows icons
2019-08-17 11:19:57 -07:00
Jonah Aragon
cb80dabba0 Replace Trisquel with Fedora (#1156)
* Replace Trisquel with Fedora

* Reorder recommendations
2019-08-17 15:53:24 +00:00
Mikaela Suomalainen
1947b84dcf Real time communication improvements (#1147)
* voice-video-messenger: remove duplicates with instant-messenger

also move Tox and Jami to Instant Messengers, Change Jitsi to Jitsi Meet

* instant-messenger: remove platforms of Signal Desktop

https://github.com/privacytoolsIO/privacytools.io/issues/967#issuecomment-520268788

* instant-messenger: add indepedent security audits

* voice-video-messenger: mention that many are already listed above

* instant-messenger: fix formatting & mention features of Jami

* voice-video-messenger: list Mumble

* update source_code.md

* voice-video-messenger: fix card

* add Mumble.png

* Small revisions to the instant messengers

* Spelling!

* voice-video-messenger: add a warning on Jitsi Meet WebRTC

* instant-messenger: remove a from Jami

* instant-messenger: add VoIP badges

* Use updated label functionality

The labels/badges functionality added to cardv2.html in cbe5de4cc2d13d593b5f6d039a236a8b85fe0edd work better here.

* Fix Jitsi Meet warning badge
2019-08-16 21:33:32 -05:00
Jonah Aragon
3693e60cb7
Remove some providers (#1155)
* Remove some providers

* Remove old logos
2019-08-13 16:12:16 -05:00
Mikaela Suomalainen
8cd4419f0e Add Team chat section (#1067)
* Teamchat: initial commit

* teamchat: remove todo notes from cards

* nav.html: fix teamchat link

* assets: add icons for keybase & rocket.chat

* teamchat: add forum threads

* nav.html: change teamchat icon

* apply Jonah's suggestion on Keybase

* Jonah's & Nitrohorse's suggestions

* update keybase.png

* teamchat: delist mattermost

* teamchat: update description, add links

* update descriptions of apps

* fix keybase description

* teamchat: fix heading

* expand rocket.chat warning

* add missing the

* remove reduntant backslashes

* add teamchat to source_code.md

* small changes

* remove backslashes from link

* teamchat: add Wire Pro as worth mentioning

* remove excess '
2019-08-11 08:40:38 -07:00
nitrohorse
b3717aa997 Add Soverin (#1121) 2019-08-09 21:41:45 +00:00
nitrohorse
f7512061cd
Remove cryptostorm (#1103) 2019-08-07 20:36:16 -07:00
Jonah Aragon
a4ba40a92d Add Social News Aggregators (#1091)
* Create online_bulletin_board.html

* Update nav.html

* Create social-news-agregator.html

* Update nav.html

* Update and rename online_bulletin_board.html to social-news-agregator.html

* Update old.html

* Add files via upload

* Update social-news-agregator.html

* Attempt to fix build error

* attempt

* Fix mistake

* Delete voat.png

* Add files via upload

* Update social-news-agregator.html

* Remove Voat

* Update social-news-agregator.html

* Update social-news-agregator.html

* Update social-news-agregator.html

* Update social-news-agregator.html

* minor fix

* Update social-news-agregator.html

Merges the changes from https://github.com/gjhklfdsa/privacytools.io/pull/4 into this PR.

Co-Authored-By: gjhklfdsa1 <gjhklfdsa1@users.noreply.github.com>

* Change icon to fa-newspaper

* Syntax and spelling fixes

* Update aether logo
2019-08-07 08:30:44 +00:00
Dawid Potocki
a374e6d201 Update logos (#1083)
StartMail, StartPage, F-Droid, Purism, Thunderbird, Tor Browser
2019-08-03 08:29:20 -07:00
nitrohorse
18b1761a16
Browser Addons: Add Snowflake (#1040)
* Add Snowflake to browser addons section

* Remove Firefox and Chrome links

* Add forum link

* Update description

Thanks, Jonah! ❤️
2019-07-21 12:39:29 -07:00
Andrew Morgan
c1a2045a99 Add new Riot logo (#1002) 2019-06-21 15:06:00 +03:00
gjhklfdsa
ae2afdaf13 Add Source Code (#707)
* Add Source Code URLs [WIP]

* Update [WIP]

* Update source_code.md

* Update source_code.md

* Update source_code.md

* Update source_code.md

* Update source_code.md

* Update source_code.md

* Update source_code.md

* Update default.html

* Update source_code.md

* Update source_code.md

* Update source_code.md

* Update source_code.md

* Add front matter

* Source_Code.md Update

Thanks to @Mikaela for recommending these URLs. :)

* Update source_code.md

Thanks to @Mikaela

* Update source_code.md

* Update source_code.md

* Update card.html

* Add files via upload

* Fix | Fix Confilcts

* Undo

* Add Disroot Website

* Password Safe

* Update source_code.md

* Update source_code.md

* Update nav.html

* Re-add Source_code.md

* Update source_code.md

* Update source_code.md

* Update source_code.md

* Update source_code.md

* Update source_code.md

* Update source_code.md
2019-06-16 08:58:51 +08:00
Jonah Aragon
38d9fd223a Relicense under CC0 (#940) 2019-05-19 09:41:30 +02:00
Spydar007
eb593c35b4 Remove Ghostbin (#931)
Ghostbin is shutting down at the end of May
2019-05-15 23:29:34 +08:00
BurungHantu1605
1d1ec580a4 Create ovpn.png 2019-05-06 15:50:24 +08:00
BurungHantu1605
cd2ef2bfbc vpn adblock issue 2019-05-06 15:50:09 +08:00
Jonah Aragon
fb5696a54f Add librehost.json (#895)
#816
2019-05-06 06:58:31 +08:00
BurungHantu1605
002e26f09c Added PixelFed 2019-05-05 13:28:58 +08:00
BurungHantu1605
1fac434044 cardv2 for Social Networks 2019-05-05 13:21:10 +08:00
BurungHantu1605
8f07971fb2 cardv2 for search engines 2019-05-05 12:47:00 +08:00
Jonah Aragon
a0abeebe24
Merge branch '832' 2019-05-04 22:22:02 -05:00
BurungHantu1605
889d982dcd issue with file names resolved 2019-05-05 09:58:29 +08:00
BurungHantu1605
260eea5d01 issue with file names 2019-05-05 09:58:05 +08:00
BurungHantu1605
d4d4e597f2 Merge branch 'master' of https://github.com/privacytoolsIO/privacytools.io 2019-05-05 09:55:45 +08:00
BurungHantu1605
59924d3661 logo update 2019-05-05 09:54:48 +08:00
Burung Hantu
bdcf5e9cfd
Card v2 for browser addons (#903) 2019-05-05 09:46:59 +08:00
Jonah Aragon
5a991a731d
Add GrapheneOS 2019-05-01 18:56:38 -05:00
BurungHantu1605
1dcb23adb8 Merge branch 'master' of https://github.com/privacytoolsIO/privacytools.io 2019-04-22 10:33:23 +08:00
BurungHantu1605
d900cea8a9 Added Mastodon and Discourse 2019-04-22 10:33:18 +08:00
Alberto
4d47081b2a Enable flags again (#873)
* Re-added flags

* Removed 4x3 folder
2019-04-21 20:30:19 +00:00
Alberto
6b6ee86df8 Logos Changes (#862)
* Changes to some logos

 - Changed Bahnhof and CryptPad logos so they're no longer stretched
 - Added a logo for Firefox Send
 - Chaged ZeroBin logo
 - Changed VeraCrypt logo with a bigger one

* Tor-Project -> Tor-Browser logo
2019-04-17 11:26:02 +08:00
Burung Hantu
198392b2b6
Add QR Codes (#851)
* Add QR Codes

* #851

* #851

* #851

* #851

* #851
2019-04-11 08:25:19 +08:00
Burung Hantu
8f16a14fc7
Added Orbot (#837) 2019-04-08 10:57:02 +08:00
troutperch
3e69750032 Remove national flags from the language select.(Solution 2) (#825)
* Remove national flags from the language select.

* Removed flag-icon-css.

* Removed the line break for old language select.
2019-04-04 07:51:39 +08:00
Jonah Aragon
5543808d53
Add contact page 2019-04-02 20:51:13 -05:00
BurungHantu1605
94fd862421 #500 2019-04-02 12:26:37 +08:00
BurungHantu1605
b109736647 #678 2019-04-01 11:00:32 +08:00