source.dussan.org Git - archiva.git/commit

]> source.dussan.org Git - archiva.git/commit

author	Olivier Lamy <olamy@apache.org>
	Mon, 2 Apr 2012 10:06:52 +0000 (10:06 +0000)
committer	Olivier Lamy <olamy@apache.org>
	Mon, 2 Apr 2012 10:06:52 +0000 (10:06 +0000)
commit	f396d2802b8c1228488bc64a769890ff0039f75c
tree	8f9e8566152a924a8db598677029e332d79d5a1a	tree \| snapshot
parent	b8daf5c0dee828527aa541310bb1b8deee04ff1d	commit \| diff

merge template files together

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1308279 13f79535-47bb-0310-9956-ffa450edef68

archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js		diff \| blob \| history
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/network-proxies.html	[deleted file]	blob \| history
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html		diff \| blob \| history

Apache Archiva Repository: https://github.com/apache/archiva