Skip to content

Traduccion configparser #390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Jul 27, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch '3.8' into traduccion-configparser
  • Loading branch information
clacri authored Jun 21, 2020
commit 170f7df5b982e3855b41eb81c064cf2e83c13526
1 change: 1 addition & 0 deletions TRANSLATORS
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Silvina Tamburini (@silvinabt87)
David Trigo Chávez (@dtrinf)
Agustina Quiros (@qagustina)
Luis Llave (@llaveluis)
María Andrea Vignau (@mavignau @marian-vignau)
Leonardo Gomez (@gomezgleonardob)
José Miguel Hernández Cabrera (@miguelheca)

5 changes: 1 addition & 4 deletions dict
Original file line number Diff line number Diff line change
Expand Up @@ -594,9 +594,6 @@ xz
ydel
zip
zipimporter
<<<<<<< HEAD
zip
=======
zlib
ésimo
option
Expand Down Expand Up @@ -648,4 +645,4 @@ definirlos
idempotente
indentados
proxies
redefinidas
redefinidas
You are viewing a condensed version of this merge commit. You can view the full changes here.