John Chilton eb2034ac6e Merge remote-tracking branch 'erasche/ie-updates2' into pr229 ...

Conflicts:
	config/plugins/interactive_environments/ipython/config/ipython.ini.sample

2015-05-10 23:17:17 -04:00

..

config

Merge remote-tracking branch 'erasche/ie-updates2' into pr229

2015-05-10 23:17:17 -04:00

static/js

Remove files indicated by Bjoern.

2014-10-19 17:38:30 -04:00

templates

Update documentation on the get() function

2015-05-06 11:48:37 -05:00