Ramunas Kraujutis 2e9f14dfd8 Merge branch 'master-upstream' into feature-lithuanian-locale ...

# Conflicts:
#	themes/src/main/resources/theme/base/account/messages/messages_en.properties
#	themes/src/main/resources/theme/base/account/theme.properties
#	themes/src/main/resources/theme/base/admin/theme.properties
#	themes/src/main/resources/theme/base/email/theme.properties
#	themes/src/main/resources/theme/base/login/theme.properties

2016-09-04 22:20:03 +03:00

..

src/main/resources

Merge branch 'master-upstream' into feature-lithuanian-locale

2016-09-04 22:20:03 +03:00

pom.xml

Set version to 2.2.0-SNAPSHOT

2016-08-10 08:57:18 +02:00