diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
| commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
| tree | f1fdd326034e05177596851be6a7127615d81498 /tests/phpunit/data/gitinfo | |
| parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
| parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) | |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'tests/phpunit/data/gitinfo')
| -rw-r--r-- | tests/phpunit/data/gitinfo/info-testValidJsonData.json | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/phpunit/data/gitinfo/info-testValidJsonData.json b/tests/phpunit/data/gitinfo/info-testValidJsonData.json index e955a2b6..8cf21bda 100644 --- a/tests/phpunit/data/gitinfo/info-testValidJsonData.json +++ b/tests/phpunit/data/gitinfo/info-testValidJsonData.json @@ -1 +1,7 @@ -{
"head": "refs/heads/master",
"headSHA1": "0123456789abcdef0123456789abcdef01234567",
"headCommitDate": "1070884800",
"branch": "master",
"remoteURL": "https://gerrit.wikimedia.org/r/mediawiki/core"
}
\ No newline at end of file +{ + "head": "refs/heads/master", + "headSHA1": "0123456789abcdef0123456789abcdef01234567", + "headCommitDate": "1070884800", + "branch": "master", + "remoteURL": "https://gerrit.wikimedia.org/r/mediawiki/core" +} |