2. Mapotempo App
  3. Changes

User avatar admin

Rebased repository

Mapotempo App / Mapotempo App

Rebased repository 7 years ago
User avatar admin

Resource update

Mapotempo App / Mapotempo App — Portuguese

Resource update 7 years ago
User avatar admin

Resource update

Mapotempo App / Mapotempo App — Hebrew

Resource update 7 years ago
User avatar admin

Resource update

Mapotempo App / Mapotempo App — Persian

Resource update 7 years ago
User avatar admin

Resource update

Mapotempo App / Mapotempo App — Spanish

Resource update 7 years ago
User avatar admin

Resource update

Mapotempo App / Mapotempo App — English

Resource update 7 years ago
User avatar admin

Resource update

Mapotempo App / Mapotempo App — Arabic

Resource update 7 years ago
User avatar admin

Merged repository

Mapotempo App / Mapotempo App

Merged repository 7 years ago
User avatar admin

Pushed changes

Mapotempo App / Mapotempo App

Pushed changes 7 years ago
User avatar admin

Rebased repository

Mapotempo App / Mapotempo App

Rebased repository 7 years ago
User avatar admin

Pushed changes

Mapotempo App / Mapotempo App

Pushed changes 7 years ago
User avatar admin

Resource update

Mapotempo App / Mapotempo App — Portuguese

Resource update 7 years ago
User avatar admin

Resource update

Mapotempo App / Mapotempo App — Hebrew

Resource update 7 years ago
User avatar admin

Resource update

Mapotempo App / Mapotempo App — Persian

Resource update 7 years ago
User avatar admin

Resource update

Mapotempo App / Mapotempo App — Spanish

Resource update 7 years ago
User avatar admin

Resource update

Mapotempo App / Mapotempo App — English

Resource update 7 years ago
User avatar admin

Resource update

Mapotempo App / Mapotempo App — Arabic

Resource update 7 years ago
User avatar admin

Rebased repository

Mapotempo App / Mapotempo App

Rebased repository 7 years ago
User avatar admin

Failed merge on repository

Mapotempo App / Mapotempo App 

Auto-merging test/models/vehicle_test.rb
Removing test/fixtures/customers.yml_
Auto-merging lib/optim/optimizer_wrapper.rb
Auto-merging config/locales/pt.yml
CONFLICT (content): Merge conflict in config/locales/pt.yml
Auto-merging config/locales/fr.yml
Auto-merging config/locales/fr.devices.yml
CONFLICT (content): Merge conflict in config/locales/fr.devices.yml
Auto-merging config/locales/en.yml
Auto-merging config/locales/en.devices.yml
Auto-merging app/templates/stops/_show.mustache
CONFLICT (content): Merge conflict in app/templates/stops/_show.mustache
Auto-merging app/models/vehicle.rb
Auto-merging app/api/api_v01.rb
Automatic merge failed; fix conflicts and then commit the result. (1)
7 years ago
User avatar admin

Failed merge on repository

Mapotempo App / Mapotempo App 

Auto-merging test/models/vehicle_test.rb
Auto-merging lib/optim/optimizer_wrapper.rb
Auto-merging config/locales/pt.yml
CONFLICT (content): Merge conflict in config/locales/pt.yml
Auto-merging config/locales/fr.yml
Auto-merging config/locales/fr.devices.yml
CONFLICT (content): Merge conflict in config/locales/fr.devices.yml
Auto-merging config/locales/en.yml
Auto-merging config/locales/en.devices.yml
Auto-merging app/templates/stops/_show.mustache
CONFLICT (content): Merge conflict in app/templates/stops/_show.mustache
Auto-merging app/models/vehicle.rb
Auto-merging app/api/api_v01.rb
Automatic merge failed; fix conflicts and then commit the result. (1)
7 years ago

Search