Differences

This shows you the differences between two versions of the page.

--- faction:yamatai:senate:marriage_act_1 [2018/01/05 18:18] – created kim
+++ faction:yamatai:senate:marriage_act_1 [2019/06/21 12:19] – Remove forced line breaks wes
@@ Line 1: / Line 1: @@
 ====== Marriage Act 1 ======
-[[https://www.tapatalk.com/groups/grandstararmy/proposal-50-marriage-t1353-s10.html|Proposal #50 Marriage]] was created in [[calendar:ye 24]] and failed to a vote of 5 Yay / 12 Nay. It was resubmitted as [[faction:yamatai:senate:marriage_act|Proposal #52 Marriage Act]].
+[[https://www.tapatalk.com/groups/grandstararmy/proposal-50-marriage-t1353-s10.html|Proposal #50 Marriage]] was created in [[timeline:ye_24]] and failed to a vote of 5 Yay / 12 Nay in the [[faction:yamatai:senate]]. It was resubmitted as [[faction:yamatai:senate:marriage_act|Proposal #52 Marriage Act]].
 ====Purpose:====
@@ Line 16: / Line 16: @@
 ===== OOC Notes =====
-[[https://www.tapatalk.com/groups/grandstararmy/proposal-50-marriage-t1353-s10.html|Proposal #50 Marriage]] was written on 09 Jan 2004. \\
+[[https://www.tapatalk.com/groups/grandstararmy/proposal-50-marriage-t1353-s10.html|Proposal #50 Marriage]] was written on 09 Jan 2004.
-[[user:kim]] created this article on 2018/01/05 18:08.
+Kim created this article on 2018/01/05 18:08.

STAR ARMY