Joe Cheng b6a2122a41 Merge remote-tracking branch 'origin/master' into htmltools-refactor ...

Conflicts:
	R/shiny.R
	man/session.Rd

2014-05-28 13:18:49 -07:00

..

examples

Change example licenses to MIT

2014-03-11 10:49:32 -07:00

staticdocs

Remove obsolete entry from staticdocs index

2014-05-14 17:13:38 -07:00

tests

Extract HTML functionality to htmltools library

2014-05-14 17:12:15 -07:00

tests-js

Merge pull request #340 from yihui/bug/null-choices

2014-01-11 13:43:05 -08:00

www

Merge remote-tracking branch 'origin/master' into htmltools-refactor

2014-05-28 13:18:49 -07:00

www-dir

Only show special "No UI defined" message for shinyAppDir

2014-05-02 18:52:37 -07:00

COPYING

add COPYING and NOTICE files

2012-07-23 02:10:04 -07:00

NOTICE

localize es5-shim.js

2014-02-19 11:58:34 -06:00