Merge remote-tracking branch 'refs/remotes/origin/feat/3D-view'

Browse Source

Conflicts:
	app/Resources/assets/javascripts/ModelViewer.js
	app/Resources/views/default/index.html.twig
	gulpfile.js

...

This commit is contained in:

David Hübner 2017-01-13 16:12:25 +01:00

parent d950f7f13b 3c87c7ef77

commit d6810286dc

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available