diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-09-05 10:46:33 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-09-05 10:46:33 +0200 |
| commit | e0db6ad2087d1750de433b1c198ab8cc08872d79 (patch) | |
| tree | 84e99ad8379a1f0b46c8538fc1392655e1d177f2 /.gitattributes | |
| parent | e3ea0057e30ee844076df98a8a7350ebb78754d8 (diff) | |
| parent | 7db84033da5880f2e3501865749a8c166fe2d358 (diff) | |
| download | otp-e0db6ad2087d1750de433b1c198ab8cc08872d79.tar.gz otp-e0db6ad2087d1750de433b1c198ab8cc08872d79.tar.bz2 otp-e0db6ad2087d1750de433b1c198ab8cc08872d79.zip | |
Merge remote branch 'upstream/dev' into major
* upstream/dev:
Corrected spec name errors: ip_adress -> ip_address port_num -> port_number
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions