Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Thu, 11 Jan 2018 06:46:31 +0000 (22:46 -0800)
committerIvan Kohler <ivan@freeside.biz>
Thu, 11 Jan 2018 06:46:31 +0000 (22:46 -0800)
1  2 
httemplate/edit/elements/edit.html

Simple merge