Skip to content

Commit 42a80ba

Browse files
committed
Undo license change
1 parent 6e3e77f commit 42a80ba

File tree

3 files changed

+1
-25
lines changed

3 files changed

+1
-25
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Description: Shiny makes it incredibly easy to build interactive web
99
applications with R. Automatic "reactive" binding between inputs and
1010
outputs and extensive pre-built widgets make it possible to build
1111
beautiful, responsive, and powerful applications with minimal effort.
12-
License: GPL (>= 2) | GPL (>=2) + file LICENSE
12+
License: GPL-3
1313
Depends:
1414
R (>= 2.14.1)
1515
Imports:

LICENSE

Lines changed: 0 additions & 21 deletions
This file was deleted.

NEWS

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
shiny 0.5.0
22
--------------------------------------------------------------------------------
33

4-
* License for Shiny changed to GPL >= 2, and a few files are dual-licensed
5-
under the GPL >= 2 and BSD 3-clause.
6-
74
* Switch from websockets package for handling websocket connections to httpuv.
85

96
* New method for detecting hidden output objects. Instead of checking that

0 commit comments

Comments
 (0)