Merge remote-tracking branch 'origin/develop' into feature/remove_mootols

Browse Source

Conflicts:
	wise-editor/src/main/webapp/js/less.js
	wise-webapp/pom.xml
	wise-webapp/src/main/webapp/js/less.js

...

This commit is contained in:

Ezequiel Bergamaschi

2014-08-18 21:35:45 -03:00

parent 91bc92d18b c282a80b5d

commit b923e21bce

5 changed files with 105 additions and 15 deletions

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

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

16

mindplot/src/main/javascript/libraries/less/less-1.6.2.min.js vendored Normal file

File diff suppressed because one or more lines are too long