6 commits

Author	SHA1	Message	Date
Micah Lee	61179a0860	Fix bad merge in license comment	2018-09-15 19:05:40 -07:00
Micah Lee	905a444099	Merge branch 'develop' into receiver-mode-gui	2018-09-14 18:59:36 -07:00
Micah Lee	e05cee19bc	Update OnionShare copyright year to 2018	2018-06-17 16:53:44 -07:00
Micah Lee	52fa4f3485	Update GPL copyright year	2018-04-24 10:07:59 -07:00
Micah Lee	c0a26b7c6c	Change GPL copyright from 2016 to 2017	2017-01-06 18:58:15 -08:00
Micah Lee	ad0a618702	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