Merge remote-tracking branch 'upstream/master'}
Conflicts:
src/GitList/Git/Repository.php
Lukas Domnick authored
on May 12, 2013, 7:47:37 PM
-
boot.phpDiff lines: 11 Type: text
-
build.xmlDiff lines: 58 Type: text
-
composer.jsonDiff lines: 9 Type: text
-
composer.lockDiff lines: 168 Type: text
-
config.ini-exampleDiff lines: 20 Type: text
-
index.phpDiff lines: 16 Type: text
-
src/GitList/Application.phpDiff lines: 80 Type: text
-
src/GitList/Config.phpDiff lines: 46 Type: text
-
src/GitList/Controller/BlobController.phpDiff lines: 46 Type: text
-
src/GitList/Controller/CommitController.phpDiff lines: 45 Type: text
-
src/GitList/Controller/MainController.phpDiff lines: 71 Type: text
-
src/GitList/Controller/TreeController.phpDiff lines: 71 Type: text
-
src/GitList/Exception/BlankDataException.phpDiff lines: 9 Type: text
-
src/GitList/Exception/EmptyRepositoryException.phpDiff lines: 10 Type: text
-
src/GitList/Git/Client.phpDiff lines: 26 Type: text
-
src/GitList/Git/Repository.phpDiff lines: 94 Type: text
-
src/GitList/Provider/GitServiceProvider.phpDiff lines: 22 Type: text
-
src/GitList/Util/Repository.phpDiff lines: 22 Type: text
-
src/GitList/Util/Routing.phpDiff lines: 95 Type: text
-
tests/InterfaceTest.phpDiff lines: 210 Type: text
-
views/index.twigDiff lines: 11 Type: text
-
Diff lines: 8 Type: text
-
views/search.twigDiff lines: 9 Type: text
-
views/tree.twigDiff lines: 18 Type: text