Paulo Gustavo Veiga a74efa4647 Merge branch 'master' into db-purge ...

Conflicts:
	mindplot/src/main/javascript/MainTopic.js
	wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java
	wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java

2012-11-04 01:38:52 -03:00

..

java/com/wisemapping/test

Update copyright year.

2012-11-01 21:35:01 -03:00

resources/data

Merge branch 'master' into db-purge

2012-11-04 01:38:52 -03:00

sql

- Change MYSQL blob to mediumblob.

2012-11-01 21:35:00 -03:00