Thomas Walpole 3f5c36f1a4 Merge branch '2.6_stable' ... * 2.6_stable: tagged 2.6.2 update history [ci skip] scope addressable make sure we work with addressable < 2.4.0 allow for more versions of addressable update history tagged 2.6.1 Require addressable gem in CurrentPathQuery fix typo in parameter name [ci skip]		2016-01-27 16:00:17 -08:00
..
Gemfile.base-versions	make sure we work with addressable < 2.4.0	2016-01-27 14:52:51 -08:00
Gemfile.beta-versions	sinatra merged to master	2016-01-27 08:57:11 -08:00
Gemfile.ruby-19	Lock mime-types < 3.0 when testing with ruby 1.9.3	2015-12-10 10:20:35 -08:00