Skip to content

Commit

Permalink
Sync with maint
Browse files Browse the repository at this point in the history
* maint:
  mailmap: update Pasky's address
  git-remote-mediawiki: new wiki URL in documentation
  • Loading branch information
Junio C Hamano committed Apr 4, 2013
2 parents 8d994db + 3a3101c commit bfd70c5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
<nico@fluxnic.net> <nico@cam.org>
Peter Krefting <peter@softwolves.pp.se> <peter@svarten.intern.softwolves.pp.se>
Peter Krefting <peter@softwolves.pp.se> <peter@softwolves.pp.se>
Petr Baudis <pasky@ucw.cz> <pasky@suse.cz>
Philippe Bruhat <book@cpan.org>
Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com>
Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Expand Down
2 changes: 1 addition & 1 deletion contrib/mw-to-git/git-remote-mediawiki.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ objects from mediawiki just as one would do with a classic git
repository thanks to remote-helpers.

For more information, visit the wiki at
https://github.com/Bibzball/Git-Mediawiki/wiki
https://github.com/moy/Git-Mediawiki/wiki

0 comments on commit bfd70c5

Please sign in to comment.