diff options
| author | Adrien Thebo <git@somethingsinistral.net> | 2013-04-08 10:05:29 -0700 |
|---|---|---|
| committer | Adrien Thebo <git@somethingsinistral.net> | 2013-04-08 10:05:29 -0700 |
| commit | db00ce660520abfdc110d1ed0dd10bfbc708e256 (patch) | |
| tree | d6e00ece57167148343ed93b6fef7ff5ea306898 | |
| parent | 87c0f0c45418b276942e3de6deb8a2b681566019 (diff) | |
| parent | af7bed2bc82be0123e2aefe5d569661718e0d6f4 (diff) | |
Merge branch '2.x' into 3.x
This ignores the 2.x .travis.yml when merging up since that version is
only applicable to the 2.x branch.
Conflicts:
.travis.yml
0 files changed, 0 insertions, 0 deletions