summaryrefslogtreecommitdiff
path: root/spec/spec_helper_acceptance.rb
diff options
context:
space:
mode:
authorBryan Jen <bryan.jen@gmail.com>2015-05-21 12:50:20 -0700
committerBryan Jen <bryan.jen@gmail.com>2015-05-21 12:50:20 -0700
commit118eb7bcbdc85e9b6d3778e4536b6940a3d23087 (patch)
tree91b4dcb94e626a546a3956eda3585eb318f04465 /spec/spec_helper_acceptance.rb
parent3d3220033fd8be6d7314f995a087d72654d4b8cd (diff)
parente94d67588b368ae51671d777e0f0e53d24e28dea (diff)
Merge pull request #251 from mhaskel/merge_1.3.x_to_master
Merge 1.3.x to master
Diffstat (limited to 'spec/spec_helper_acceptance.rb')
0 files changed, 0 insertions, 0 deletions