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:55:11 +0000 (14:55 -0700)
commit30c9a71ef6f389f1fb70b1551635c9268f3be94c
treea32c229fc8db84c7c96c705544198fd074b1d2f9
parentdf2d61c5308891cc5d4fe7df9cdaef623a16fce3
Merge branch 'github/pr/55_reprise'
FS/FS/Conf.pm
FS/FS/L10N/es_ar.pm [new file with mode: 0644]
FS/FS/Locales.pm
httemplate/pref/pref.html