Resource update
Mapotempo App / Mapotempo App — Spanish
Merged repository
Mapotempo App / Mapotempo App
Rebased repository
Failed merge on repository
Auto-merging config/locales/es.yml CONFLICT (content): Merge conflict in config/locales/es.yml Automatic merge failed; fix conflicts and then commit the result. (1)
Committed changes
Mapotempo App / Mapotempo App — Portuguese
Mapotempo App / Mapotempo App — Hebrew
Mapotempo App / Mapotempo App — English
Auto-merging 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)
admin
None