Skip to content

Commit

Permalink
Merge branch 'master' into crypto-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
mingyangyang committed Feb 1, 2018
2 parents d365b26 + fc4d6fb commit 165511b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion unittests/test_object.py
Original file line number Diff line number Diff line change
Expand Up @@ -586,4 +586,4 @@ def test_get_acl(self, do_request):


if __name__ == '__main__':
unittest.main()
unittest.main()

0 comments on commit 165511b

Please sign in to comment.