diff options
| author | Robert Newson <robert.newson@cloudant.com> | 2011-10-31 18:36:54 +0000 |
|---|---|---|
| committer | Robert Newson <robert.newson@cloudant.com> | 2011-10-31 18:54:51 +0000 |
| commit | 8bbd833f866c8dfdaaf06f3dc5a5ca06030504e8 (patch) | |
| tree | c5da36c09f33c689a70d99480327140362031d8e /.gitignore | |
| parent | a6352493651f6f8e3430269555421b5599a77809 (diff) | |
| parent | af7a6ae52890c6c158615068f2a48d40c52ec538 (diff) | |
Merge commit '1.1.1' into 0.4.x
Conflicts:
acinclude.m4.in
configure.ac
couchjs/c_src/http.c
src/erlang-oauth/Makefile.am
src/erlang-oauth/oauth.app.in
src/erlang-oauth/oauth_hmac_sha1.erl
src/erlang-oauth/oauth_http.erl
src/erlang-oauth/oauth_plaintext.erl
src/etap/etap_web.erl
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions