Failed merge on repository
Mapotempo App / Mapotempo App
Removing test/mailers/.keep Auto-merging config/locales/fr.yml CONFLICT (content): Merge conflict in config/locales/fr.yml Auto-merging config/locales/en.yml CONFLICT (content): Merge conflict in config/locales/en.yml Automatic merge failed; fix conflicts and then commit the result. (1)
Committed changes
Mapotempo App / Mapotempo App — Portuguese
Translation completed
Resource update
Mapotempo App / Mapotempo App — Persian
Mapotempo App / Mapotempo App — Arabic
Added to glossary
Mapotempo App — Portuguese Mapotempo App
Mapotempo App / Mapotempo App — English
Rebased repository
Mapotempo App / Mapotempo App — Hebrew
Mapotempo App / Mapotempo App — Spanish
Merged repository
admin
None
jferreira