Douwe Maan 41529b9254 Merge branch 'master' into expiration-date-on-memberships		2016-08-18 19:04:31 -05:00
..
api	Merge branch 'master' into expiration-date-on-memberships	2016-08-18 19:04:31 -05:00
ci/api	…
git_http_spec.rb	…
jwt_controller_spec.rb	…
lfs_http_spec.rb	…