Mike Greiling cb1e4a8abb Merge branch 'master' into 'remove-dropzonejs-rails' ... # Conflicts: # Gemfile.lock		2018-09-28 18:33:41 +00:00
..
assets	Move xterm to a node dependency and remove global code [ci skip]	2018-08-03 14:26:24 +01:00
Dockerfile	Update templates and licenses for 11.3	2018-09-10 10:30:17 +02:00
gitignore	Update templates and licenses for 11.3	2018-09-10 10:30:17 +02:00
ingress
jupyter
project_templates
prometheus
runner
licenses.csv	Merge branch 'master' into 'remove-dropzonejs-rails'	2018-09-28 18:33:41 +00:00