Merge branch 'develop' into update-deps

This commit is contained in:
Micah Lee 2018-09-17 21:03:37 -07:00
commit aed48e6e40
70 changed files with 3111 additions and 1163 deletions

View file

@ -2,7 +2,7 @@
"""
OnionShare | https://onionshare.org/
Copyright (C) 2018 Micah Lee <micah@micahflee.com>
Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com>
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