Merge branch 'master' into develop

This commit is contained in:
Morgan 2015-03-14 07:50:58 +00:00
commit a46bd352b2

View File

@ -63,7 +63,7 @@
(html (html
[:html [:html
[:head [:head
[:title "Pronoun examples"] [:title "Pronoun Island: Examples"]
[:link {:rel "stylesheet" :href "/pronouns.css"}]] [:link {:rel "stylesheet" :href "/pronouns.css"}]]
[:body [:body
(examples-block subject object possessive-determiner possessive-pronoun reflexive) (examples-block subject object possessive-determiner possessive-pronoun reflexive)
@ -91,7 +91,7 @@
(html (html
[:html [:html
[:head [:head
[:title "Main Page"] [:title "Pronoun Island"]
[:link {:rel "stylesheet" :href "/pronouns.css"}]] [:link {:rel "stylesheet" :href "/pronouns.css"}]]
[:body [:body
[:div {:class "table"} [:div {:class "table"}