Clone
Matt Wringe
committed
on 08 Jan 13
Merge branch 'master' into mobile
Conflicts:
component/portal/src/main/java/org/exoplatform/portal/config/model/PortalConfig.java
mobile-i… Show more
Merge branch 'master' into mobile

Conflicts:

        component/portal/src/main/java/org/exoplatform/portal/config/model/PortalConfig.java

        mobile-integration/extension-configuration/src/main/webapp/WEB-INF/conf/portal/portal/mobile/pages.xml

        mobile-integration/extension-configuration/src/main/webapp/WEB-INF/conf/portal/portal/template/portal/mobile/portal.xml

        packaging/jboss-as7/pkg/package.xml

        packaging/jboss-as7/pkg/pom.xml

        packaging/jboss-as7/pkg/src/main/resources/jboss/main/gatein/gatein.ear/META-INF/application.xml

        packaging/jetty/pkg/pom.xml

        packaging/tomcat/pkg/pom.xml

        pom.xml

        portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java

        web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml

        web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml

        web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/portal.xml

        web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml

        web/redirect/src/main/java/org/gatein/web/redirect/implementation/SiteRedirectServiceImpl.java

Show less

3.6.x + 4 more