[SUCS Devel] [Git][sucssite/sucs-site][sucs-site] 4 commits: grammar

[Imran Hussain]

Imran Hussain pushed to branch sucs-site at sucssite / sucs-site


Commits:
c14fcdca by Andy Pover at 2016-04-25T15:18:24+01:00
grammar
- - - - -
77f4ec17 by Imran Hussain at 2016-05-30T20:15:05+01:00
Remove live cam image from site.

- - - - -
5d6c6eed by Imran Hussain at 2016-05-30T20:17:08+01:00
Merge branch 'master' into beta

- - - - -
ebd2ef8d by Imran Hussain at 2016-05-30T20:17:36+01:00
Merge branch 'beta' into sucs-site

- - - - -


2 changed files:

- − static/About/Room-secondary.txt
- templates/societies.tpl


Changes:

=====================================
static/About/Room-secondary.txt deleted
=====================================
--- a/static/About/Room-secondary.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="cbb">
-<h3>Live Webcam</h3>
-
-	<div>
-		<img style="max-height:100%; max-width:100%;" src="https://sucs.org/images/lastsnap.jpg">
-	</div>
-
-</div>
\ No newline at end of file


=====================================
templates/societies.tpl
=====================================
--- a/templates/societies.tpl
+++ b/templates/societies.tpl
@@ -1,4 +1,4 @@
-<p>The Student Union's societies website can be found at <a href="http://swansea-union.co.uk/societies">http://swansea-union.co.uk/societies</a>.
+<p>The Students' Union's societies website may be found at <a href="http://swansea-union.co.uk/societies">http://swansea-union.co.uk/societies</a>.
 </p>
 
 <p>The following societies' websites are hosted by SUCS:</p>



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/f8f3c8f33c415685f594c0caedce6e66bea56d56...ebd2ef8d156139dd7ea3ce28748cc6b2dab87e7b
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20160530/25060352/attachment.html>