Merge remote-tracking branch 'origin/trial/gui' into trial/gui

Conflicts:
	WebContent/OSRM.config.js
This commit is contained in:
DennisSchiefer 2012-05-16 10:32:21 +01:00
commit c900cd0122

View File

@ -92,4 +92,4 @@ OSRM.DEFAULTS = {
MAINTENANCE: false,
MAINTENANCE_HEADER: "Scheduled Maintenance",
MAINTENANCE_TEXT: "The OSRM Website is down for a scheduled maintenance. Please be patient while required updates are performed. The site will be back online shortly.<br/><br/>In the meantime you may want to go out an map a friendly neighborhood near you...<br/><br/><br/>[OSRM]",
};
};