Differences

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

--- faction:yamatai:senate:limitation_of_intercrew_fighting [2018/01/05 20:36] – created kim
+++ faction:yamatai:senate:limitation_of_intercrew_fighting [2019/06/21 12:19] – Remove forced line breaks wes
@@ Line 1: / Line 1: @@
 ====== Limitation Of Intercrew Fighting ======
-Proposal #26: Limitation of intercrew fighting was submitted to the [[faction:yamatai:senate]] by Aeriyon Elisias and passed unanimously in [[calendar:ye 23]].
+Proposal #26: Limitation of intercrew fighting was submitted to the [[faction:yamatai:senate]] by Aeriyon Elisias and passed unanimously in [[timeline:ye_23]].
 ====Purpose:====
   - To maintain sanity on GSA ships.
@@ Line 8: / Line 8: @@
   - Unarmed training combat is allowed, as to maintain combat readiness, within certain parameters, specified by commanding officer.
 ===== OOC Notes =====
-[[https://www.tapatalk.com/groups/grandstararmy/proposal-26-limitation-of-intercrew-fighting-t1368.html?sid=0759ed21d081e1ae9818e480d972678f|Proposal #26: Limitation of intercrew fighting]] was written Aeriyon Elisias on 13 Jul 2003.\\
+[[https://www.tapatalk.com/groups/grandstararmy/proposal-26-limitation-of-intercrew-fighting-t1368.html?sid=0759ed21d081e1ae9818e480d972678f|Proposal #26: Limitation of intercrew fighting]] was written Aeriyon Elisias on 13 Jul 2003.
-[[user:kim]] created this article on 2018/01/05 20:25.
+Kim created this article on 2018/01/05 20:25.

STAR ARMY