]> source.dussan.org Git - archiva.git/commit
projects / archiva.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b12f6e8) | patch
[MRM-980] move merge jsps inside admin dir
authorMaria Odea B. Ching <oching@apache.org>
Sun, 1 Aug 2010 04:39:49 +0000 (04:39 +0000)
committerMaria Odea B. Ching <oching@apache.org>
Sun, 1 Aug 2010 04:39:49 +0000 (04:39 +0000)
commit214bb1f70e4bb84a2186a9f7da35a9643995e20f
treeb936ddbce182b5ae0f5f60da72ab37aa4106a8abtree | snapshot
parentb12f6e842648ed07e4bafbf6bba54bd66b18ea1ccommit | diff
[MRM-980] move merge jsps inside admin dir

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@981149 13f79535-47bb-0310-9956-ffa450edef68
archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml diff | blob | history
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/mergeAction.jsp [new file with mode: 0644] blob
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/mergeExcludeConflicts.jsp [new file with mode: 0644] blob
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/mergeResults.jsp [new file with mode: 0644] blob
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeAction.jsp [deleted file] blob | history
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeActionResults.jsp [deleted file] blob | history
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeExcludeConflicts.jsp [deleted file] blob | history
Apache Archiva Repository: https://github.com/apache/archiva