Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge remote branch 'upstream/master'

  • Loading branch information...
commit e5aa676503e0c53d6bdd32556dc4248d8a5dbee8 2 parents 0e212ab + 4fdbde4
Kyle Jones authored December 21, 2009

Showing 1 changed file with 1 addition and 1 deletion. Show diff stats Hide diff stats

  1. 2  views/index.erb
2  views/index.erb
@@ -35,7 +35,7 @@
35 35
     <script type="text/javascript" src="http://timeapi.org/utc/now.json?callback=myCallback"></script>
36 36
   </pre>
37 37
 	<p>
38  
-		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>.
  38
+		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>.
39 39
 	</p>
40 40
 	<script type="text/javascript">
41 41
   var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");

0 notes on commit e5aa676

Please sign in to comment.
Something went wrong with that request. Please try again.