Joe Cheng f2410abc48 Merge remote-tracking branch 'origin/image-attr' ...

Conflicts:
	inst/www/shared/shiny.js
	inst/www/shared/shiny.js.map
	inst/www/shared/shiny.min.js
	inst/www/shared/shiny.min.js.map

2016-01-08 10:55:21 -08:00

..

examples

Merge remote-tracking branch 'yihui/feature/events'

2015-07-16 10:24:49 -07:00

staticdocs

Add bootstrapLib to staticdocs index

2016-01-07 13:51:56 -06:00

template

Fix head content location

2016-01-04 10:52:26 -06:00

tests

Add stopApp test

2015-12-28 11:18:15 -08:00

www

Merge remote-tracking branch 'origin/image-attr'

2016-01-08 10:55:21 -08:00

www-dir

Update missing-UI web page to include app.R

2014-08-07 13:26:07 -05:00