Merge branch 'master' of git+ssh://csclub.uwaterloo.ca/srv/git/www/www

This commit is contained in:
Youn Jin Kim 2013-07-19 21:28:47 -04:00
commit 5989d5e611
1 changed files with 2 additions and 2 deletions

View File

@ -8,9 +8,9 @@
<p>Spy on the office, see whether it's open or who is passing by the door!</p>
<div class="webcam"><p>
<img src="http://maltodextrin.csclub.uwaterloo.ca:8081" width="640" height="480" title="maltodextrin's Webcam"/>
<img src="/office/webcam/maltodextrin.jpg" width="640" height="480" title="maltodextrin's Webcam"/>
</p><p>
<img src="http://bit-shifter.csclub.uwaterloo.ca:8081/webcam.jpg" width="640" height="480" title="bit-shifter's Webcam"/>
<img src="/office/webcam/bit-shifter.jpg" width="640" height="480" title="bit-shifter's Webcam"/>
</p></div>
</section>