Garret Alfert 28b6a7f22d Merge branch 'master' into feature/update_to_recent_rs_spec ...

# Conflicts:
#	spec/swift/app_spec.rb

2016-06-02 22:21:16 +02:00

..

app_spec.rb

Merge branch 'master' into feature/update_to_recent_rs_spec

2016-06-02 22:21:16 +02:00