Skip to content
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

Added Ukrainian locale #2258

Merged
merged 1 commit into from
Jun 6, 2013
Merged

Added Ukrainian locale #2258

merged 1 commit into from
Jun 6, 2013

Conversation

valdemarua
Copy link
Contributor

Added Ukrainian locale.

@valdemarua
Copy link
Contributor Author

Updated.
Thank you.

@mindhalt
Copy link
Contributor

mindhalt commented Jun 6, 2013

👍

@seanlinsley
Copy link
Contributor

Could you squash these two commits?

To do that, run git rebase -i HEAD~2. You should then see something like this:

pick XXXXXX Your first commit message
pick XXXXXX Your second commit message

Change the last line to "fixup" like this:

pick XXXXXX Your first commit message
fixup XXXXXX Your second commit message

Then save & quit (in whatever editor was open), and destructively push to your remote branch that this PR is based on:

git push -f origin added-ukrainian-locale

@seanlinsley
Copy link
Contributor

I just noticed this was the second pull request you created, with the first one being #2257.

I assume the changes weren't complete? Because you can always do a git push -f like I showed above.

@valdemarua
Copy link
Contributor Author

I did it.
Daxter, thanks for your help and patience.

@seanlinsley seanlinsley merged commit c33f064 into activeadmin:master Jun 6, 2013
@seanlinsley
Copy link
Contributor

Thanks for the contribution @valdemarua :]

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants