Merge branch 'github/pr/55_reprise'
authorIvan Kohler <ivan@freeside.biz>
Thu, 18 Aug 2016 21:24:41 +0000 (14:24 -0700)
committerIvan Kohler <ivan@freeside.biz>
Thu, 18 Aug 2016 21:24:41 +0000 (14:24 -0700)
commit1aecd5bf33146bf3f374341a3814960ae1d419e8
tree0fefb042ae45bb5ec796f1c6383f18262fa373d6
parente0b6fe25cca1e2ff566cc0765f6c9fa24ed66ba8
parent31e1d1d72a371b856f4ee3e50252bf596bb8a2d1
Merge branch 'github/pr/55_reprise'
FS/FS/Conf.pm
httemplate/pref/pref.html