# HG changeset patch # User cavaliet # Date 1354127019 -3600 # Node ID 16c8dad4ff0da22459f625981e72f62cfede70f8 # Parent 903a22d6c5357fedc895213d3a6d6789c6e29359# Parent 52624408df28a9234b59e86ba4ff0220b33377f4 Merge with 52624408df28a9234b59e86ba4ff0220b33377f4 diff -r 903a22d6c535 -r 16c8dad4ff0d src/hashcut/templates/bpi_mashup_edit.html --- a/src/hashcut/templates/bpi_mashup_edit.html Wed Nov 28 19:22:15 2012 +0100 +++ b/src/hashcut/templates/bpi_mashup_edit.html Wed Nov 28 19:23:39 2012 +0100 @@ -67,7 +67,7 @@