merge with master

2018-03-30 15:36:41 +06:30
parent aa8e795d45 996392a041
commit 8e14d93c4c
220 changed files with 6716 additions and 1947 deletions
--- a/app/views/origami/redeem_payments/index.html.erb
+++ b/app/views/origami/redeem_payments/index.html.erb
@@ -9,7 +9,6 @@
 			</span>
 		</ol>
 	</div> -->
-	<h5>Reedem Payment</h5>
 	<div class="row">
 		<div class="col-lg-5 col-md-5 col-sm-5">
 			<div class="card  m-l-10 m-t-10" style="padding:0px 20px;">