summaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
authorJan-Willem van der Meer <mail@jewilmeer.nl>2014-09-11 11:46:08 +0200
committerJan-Willem van der Meer <mail@jewilmeer.nl>2014-09-11 11:46:08 +0200
commitbf0de1a500e7a9aecc7c8bbf623ad39b75c6433b (patch)
tree382df65e2b17c91e03278d58bce8dce0129a6a7b /public
parentb18d1c2786c2a385d6b797734a1afad7a01ddf35 (diff)
parent78ec7d9c9d156fe556d165c1c096bf5534d62d25 (diff)
downloadgitlab-ce-bf0de1a500e7a9aecc7c8bbf623ad39b75c6433b.tar.gz
Merge remote-tracking branch 'origin/master' into feature-oauth-refactoring
Diffstat (limited to 'public')
0 files changed, 0 insertions, 0 deletions