merge with origin

2017-10-27 17:06:07 +06:30
parent 0f24cc0999
commit 5c27dcff66
15 changed files with 135 additions and 250 deletions
--- a/app/views/origami/in_duties/index.html.erb
+++ b/app/views/origami/in_duties/index.html.erb
@@ -40,7 +40,7 @@
 </div>

 <div class="col-md-1">
-  <button type="button" class="btn btn-primary btn-block" id='back'>Back</button>
+  <button type="button" class="btn btn-default btn-block" id='back'>Back</button>
 </div>
 </div>
 <script type="text/javascript">