Merge commit 'aeced' into cc-merge

This commit is contained in:
C. Guy Yarvin 2016-11-13 19:40:27 -08:00
commit 0b0618894b

View File

@ -290,7 +290,7 @@
++ setting ++ setting
%- perk :~ %- perk :~
%noob %noob
%mutegroup %quiet
== ==
++ work ++ work
%+ knee *^work |. ~+ %+ knee *^work |. ~+
@ -772,7 +772,7 @@
cha/(list (pair ship status)) cha/(list (pair ship status))
== ==
== ==
?: (~(has in settings.she) %mutegroup) ?: (~(has in settings.she) %quiet)
+>.$ +>.$
=. +>.$ =. +>.$
|- ^+ +>.^$ |- ^+ +>.^$
@ -804,7 +804,7 @@
=+ day=(sh-repo-rogue-diff q.owners.she yid) =+ day=(sh-repo-rogue-diff q.owners.she yid)
=+ dun=q.owners.she =+ dun=q.owners.she
=. q.owners.she yid =. q.owners.she yid
?: (~(has in settings.she) %mutegroup) ?: (~(has in settings.she) %quiet)
+>.$ +>.$
=. +>.$ =. +>.$
|- ^+ +>.^$ |- ^+ +>.^$