Permalink
Browse files

Merge remote branch 'upstream/master'

  • Loading branch information...
2 parents 0e212ab + 4fdbde4 commit e5aa676503e0c53d6bdd32556dc4248d8a5dbee8 kylethefeared committed Dec 21, 2009
Showing with 1 addition and 1 deletion.
  1. +1 −1 views/index.erb
View
2 views/index.erb
@@ -35,7 +35,7 @@
<script type="text/javascript" src="http://timeapi.org/utc/now.json?callback=myCallback"></script>
</pre>
<p>
- by <a href="http://zh.soup.io/">Stoyan Zhekov</a>, <a href="http://chipt.com/">Matt Pennig</a>, and <a href="http://progrium.com">Jeff Lindsay</a>. <a href="http://github.com/progrium/timeapi/tree/master">Source code</a> is on GitHub. Hosted on <a href="http://heroku.com/">Heroku</a>.
+ A <a href="http://gliderlab.pbworks.com/TimeApi">GliderLab Collaboration</a>. <a href="http://github.com/progrium/timeapi/tree/master">Source code</a> is on GitHub. Hosted on <a href="http://heroku.com/">Heroku</a>.
</p>
<script type="text/javascript">
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");

0 comments on commit e5aa676

Please sign in to comment.