Resolve merge conflict, update rspec syntax
[arvados.git] / spec / fixtures / files /
2014-12-15 Steven BazylResolve merge conflict, update rspec syntax
2013-12-03 Volker Zöpfeladds specs for file_store
2013-11-15 Volker Zöpfeladds json fixture to test storage
2012-12-30 Steve BazylMerge pull request #13 from sanemat/multi-json-in-rails...
2012-11-02 Steven BazylRefactor key loading to support PEM + fix issue #62
2012-06-07 Steven BazylResolve merge conflict
2012-06-04 Steven BazylAdd tests for media upload