Merge branch 'develop' into receiver-mode-gui

This commit is contained in:
Micah Lee 2018-09-14 18:59:36 -07:00
commit 8312058fcc
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
25 changed files with 523 additions and 634 deletions

View file

@ -3,7 +3,7 @@
"""
OnionShare | https://onionshare.org/
Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com>
Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com>>>>>>>> develop
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by