Merge branch 'master' into menu_sync

2017-08-14 15:34:19 +06:30
parent 74d7adbaef 5a5e654dbc
commit edb4ab0425
50 changed files with 1481 additions and 172 deletions
--- a/spec/models/dining_charge_spec.rb
+++ b/spec/models/dining_charge_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe DiningCharge, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end