Resource update
Mapotempo App / Mapotempo App — Spanish
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)
Mapotempo App / Mapotempo App — Persian
Mapotempo App / Mapotempo App — Arabic
Rebased repository
Mapotempo App / Mapotempo App — Portuguese
Mapotempo App / Mapotempo App — Hebrew
Mapotempo App / Mapotempo App — English
Merged 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)
admin