Resource update
Mapotempo App / Mapotempo App — Hebrew
Mapotempo App / Mapotempo App — Spanish
Mapotempo App / Mapotempo App — English
Rebased repository
Mapotempo App / Mapotempo App
Failed merge on repository
Auto-merging config/locales/fr.yml CONFLICT (content): Merge conflict in config/locales/fr.yml Removing app/mailers/.keep Removing app/assets/images/.keep Automatic merge failed; fix conflicts and then commit the result. (1)
Mapotempo App / Mapotempo App — Portuguese
Merged repository
Auto-merging config/locales/pt.yml CONFLICT (content): Merge conflict in config/locales/pt.yml Automatic merge failed; fix conflicts and then commit the result. (1)
admin