vista de organizaciones lista #5
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
fijate si podes squashear esos 2 commits para que sean uno solo. Asi despues no queda tan sucia la lista de commits |
|
@Dinuuu no se a que te referis con squashear... :( |
|
Podes hacerlo asi : https://ariejan.net/2011/07/05/git-squash-your-latests-commits-into-one/ Es para que no queden commits que no se sabe que hace y mantener 1 commit por feature P.D: despues de hacer el squash tenes q pushear con -f si no me equivoco |
|
@Dinuuu listo el squash, se puede mergear... |
|
Rebasealo, pushealo, y si pasa Travis 👍 |
vista de organizaciones lista fix
| @@ -71,6 +71,7 @@ en: | |||
| done_edit_password: "Update" | |||
| done_edit_user: "Update" | |||
| organizations: "Organizations" | |||
| organization-link: "Go to organization" | |||
There was a problem hiding this comment.
esto deberia ser
organization:
link: "Go to organization"
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@Dinuuu nuevo pull