Skip to content

Commit

Permalink
Merge branch 'master' into demo
Browse files Browse the repository at this point in the history
  • Loading branch information
benolee committed Feb 2, 2011
2 parents 665368a + dee1e3e commit 33aacc4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion doc/website/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ <h3 class="typeface-js">Features</h3>
<div class="yui3-g" id="demo">
<div class="yui3-u-1">
<h3 class="typeface-js">Demo</h3>
<p>Try out a live demo of Xrono at <a href="http://demo.xrono.org">http://demo.xrono.org</a>. Feel free to make changes and play with the system, but be aware the database is reset automatically every hour. The Usernames are listed below with their user types, and all passwords are <strong>123456</strong>.</p>
<p>Try out a live demo of Xrono at <a href="http://demo.xrono.org">http://demo.xrono.org</a>. Feel free to make changes and play with the system, but be aware the database is reset automatically every day. The Usernames are listed below with their user types, and all passwords are <strong>123456</strong>.</p>
<table>
<thead>
<tr>
Expand Down

0 comments on commit 33aacc4

Please sign in to comment.