diff options
author | Micah Lee <micah@micahflee.com> | 2018-09-14 18:59:36 -0700 |
---|---|---|
committer | Micah Lee <micah@micahflee.com> | 2018-09-14 18:59:36 -0700 |
commit | 8312058fcc18466bc9eab3e5dced15f5fbb8ba71 (patch) | |
tree | 05612ee8c96ef3f089bd2e38c8a0843725f4e41a /dev_scripts | |
parent | b58ffc31965baac461dfe1b519c3d7081e22292b (diff) | |
parent | 6839ec43d4aea45ae487eaed459b38e3833a0a87 (diff) | |
download | onionshare-8312058fcc18466bc9eab3e5dced15f5fbb8ba71.tar.gz onionshare-8312058fcc18466bc9eab3e5dced15f5fbb8ba71.zip |
Merge branch 'develop' into receiver-mode-gui
Diffstat (limited to 'dev_scripts')
-rwxr-xr-x | dev_scripts/onionshare | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dev_scripts/onionshare b/dev_scripts/onionshare index 29cdedcc..8b6989ef 100755 --- a/dev_scripts/onionshare +++ b/dev_scripts/onionshare @@ -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 |