Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Tom Morris 2013-08-10 17:42:14 -04:00
commit 77f86617ee

View File

@ -224,7 +224,7 @@
</replace>
<replace file="${built.webapp.dir}/WEB-INF/butterfly.properties">
<replacefilter token="../../extensions/" value="extensions"/>
<replacefilter token="../../extensions" value="extensions"/>
</replace>
</target>