diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-15 13:18:54 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-15 13:18:54 +0200 |
| commit | b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1 (patch) | |
| tree | 1665938bf023545db2afcf42d924a47d7f2918b2 /maintainers/maintainer-list.nix | |
| parent | 9f8a7d26798ced69f3185a59383bbb3db6b06bde (diff) | |
| parent | c860babfe6a512aa7c7e83751547347a137ecd67 (diff) | |
| download | nixpkgs-b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1.tar nixpkgs-b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1.tar.gz nixpkgs-b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1.tar.bz2 nixpkgs-b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1.tar.lz nixpkgs-b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1.tar.xz nixpkgs-b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1.tar.zst nixpkgs-b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'maintainers/maintainer-list.nix')
| -rw-r--r-- | maintainers/maintainer-list.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f28161573dd..3a761915d8a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4156,11 +4156,11 @@ email = "miltador@yandex.ua"; name = "Vasiliy Solovey"; }; - mimadrid = { - email = "mimadrid@ucm.es"; - github = "mimadrid"; + mimame = { + email = "miguel.madrid.mencia@gmail.com"; + github = "mimame"; githubId = 3269878; - name = "Miguel Madrid"; + name = "Miguel Madrid Mencía"; }; minijackson = { email = "minijackson@riseup.net"; @@ -6649,7 +6649,7 @@ githubId = 1525767; name = "Vaibhav Sagar"; }; - valebes = { + valebes = { email = "valebes@gmail.com"; github = "valebes"; githubid = 10956211; |