Lukasz Lenart e56d8b2e07 Merge remote-tracking branch 'upstream/master' into upgrade-tiles-plugin ...

Conflicts:
	pom.xml

2016-01-12 10:42:04 +01:00

..

portlet

WW-2069 Replaces 'id' and 'name' with 'var'.

2015-11-27 22:58:50 +02:00

rest-showcase

WW-4540 Enable Strict DMI be default

2015-10-05 21:25:06 +02:00

showcase

Merge remote-tracking branch 'upstream/master' into upgrade-tiles-plugin

2016-01-12 10:42:04 +01:00

pom.xml

[maven-release-plugin] prepare for next development iteration

2015-09-28 21:15:50 +02:00