6 commits

Author	SHA1	Message	Date
Micah Lee	52981b6f98	Fix bad merge in license comment	2018-09-15 19:05:40 -07:00
Micah Lee	8312058fcc	Merge branch 'develop' into receiver-mode-gui	2018-09-14 18:59:36 -07:00
Micah Lee	9344fbd274	Update OnionShare copyright year to 2018	2018-06-17 16:53:44 -07:00
Micah Lee	b6b61f753d	Update GPL copyright year	2018-04-24 10:07:59 -07:00
Micah Lee	f8005a63ea	Change GPL copyright from 2016 to 2017	2017-01-06 18:58:15 -08:00
Micah Lee	fd41eac48d	Added dev scripts for launching onionshare and onionshare-gui from the source code tree, without having to install it	2016-12-22 16:19:54 -08:00