merge with master

2017-06-12 10:01:36 +06:30
parent f834911587 5ee3ae257a
commit 09f9a29cde
33 changed files with 537 additions and 384 deletions
--- a/spec/controllers/origami/redeem_payments_controller_spec.rb
+++ b/spec/controllers/origami/redeem_payments_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Origami::RedeemPaymentsController, type: :controller do
+
+end