origin pull master

2017-06-03 13:44:10 +06:30
parent 7529d23147
commit 138850fb24
119 changed files with 2531 additions and 462 deletions
--- a/app/views/print_settings/new.html.erb
+++ b/app/views/print_settings/new.html.erb
@@ -0,0 +1,5 @@
+<h1>New Print Setting</h1>
+
+<%= render 'form', print_setting: @print_setting %>
+
+<%= link_to 'Back', print_settings_path %>