| commit | c3375d9e434b5740808813138b28b70517e82c7d | [log] [tgz] |
|---|---|---|
| author | James E. King III <jking@apache.org> | Sun Dec 30 11:06:00 2018 -0500 |
| committer | James E. King III <jking@apache.org> | Sun Dec 30 11:06:00 2018 -0500 |
| tree | db8f0e81129461b1ddc6e7a951cbb5667ca15634 | |
| parent | a139082755369611ed243376ec3c4161452369fc [diff] [blame] | |
| parent | 384647d290e2e4a55a14b1b7ef1b7e66293a2c33 [diff] [blame] |
Merge remote-tracking branch 'origin/0.12.0' into consume-0.12.0
diff --git a/bower.json b/bower.json index 6f3c126..ff70611 100644 --- a/bower.json +++ b/bower.json
@@ -1,6 +1,11 @@ { "name": "thrift", +<<<<<<< HEAD "homepage": "https://github.com/apache/thrift.git", +======= + "version": "0.12.0", + "homepage": "https://git-wip-us.apache.org/repos/asf/thrift.git", +>>>>>>> origin/0.12.0 "authors": [ "Apache Thrift <dev@thrift.apache.org>" ],