litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into develop

Browse source 
Conflicts:
	.gitignore
This commit is contained in:
j2blake 2012-11-09 14:54:29 -05:00
commit aec2299faf
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
productMods/WEB-INF/web.xml
View file

@ -204,6 +204,15 @@
<url-pattern>/editRequestDispatch</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>EditRequestAJAX</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.edit.n3editing.controller.EditRequestAJAXController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>EditRequestAJAX</servlet-name>
<url-pattern>/editRequestAJAX</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>IndexController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.IndexController</servlet-class>