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/spec/controllers/origami/alipay_controller_spec.rb
+++ b/spec/controllers/origami/alipay_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Origami::AlipayController, type: :controller do
+
+end