User avatar bmarty

Resource update

[Deprecated] Riot Android / [DEPRECATED] Riot Android — Czech

Resource update 6 years ago
User avatar bmarty

Resource update

[Deprecated] Riot Android / [DEPRECATED] Riot Android — Catalan

Resource update 6 years ago
User avatar bmarty

Resource update

[Deprecated] Riot Android / [DEPRECATED] Riot Android — Bosnian

Resource update 6 years ago
User avatar bmarty

Resource update

[Deprecated] Riot Android / [DEPRECATED] Riot Android — Bulgarian

Resource update 6 years ago
User avatar bmarty

Resource update

[Deprecated] Riot Android / [DEPRECATED] Riot Android — Arabic

Resource update 6 years ago
User avatar bmarty

Merged repository

[Deprecated] Riot Android / [DEPRECATED] Riot Android

Merged repository 6 years ago
User avatar bmarty

Pushed changes

[Deprecated] Riot Android / [DEPRECATED] matrix-android-sdk

Pushed changes 6 years ago
User avatar bmarty

Pushed changes

[Deprecated] Riot Android / [DEPRECATED] Riot Android

Pushed changes 6 years ago
User avatar bmarty

Pushed changes

[Deprecated] Riot Android / [DEPRECATED] matrix-android-sdk

Pushed changes 6 years ago
User avatar bmarty

Merged repository

[Deprecated] Riot Android / [DEPRECATED] matrix-android-sdk

Merged repository 6 years ago
User avatar bmarty

Failed merge on repository

[Deprecated] Riot Android / [DEPRECATED] Riot Android 

Auto-merging vector/src/main/res/values-zh-rTW/strings.xml
CONFLICT (content): Merge conflict in vector/src/main/res/values-zh-rTW/strings.xml
Auto-merging vector/src/main/res/values-zh-rCN/strings.xml
Auto-merging vector/src/main/res/values-uk/strings.xml
CONFLICT (content): Merge conflict in vector/src/main/res/values-uk/strings.xml
Auto-merging vector/src/main/res/values-ru/strings.xml
Auto-merging vector/src/main/res/values-pl/strings.xml
Auto-merging vector/src/main/res/values-it/strings.xml
Auto-merging vector/src/main/res/values-hu/strings.xml
Auto-merging vector/src/main/res/values-fr/strings.xml
Auto-merging vector/src/main/res/values-eu/strings.xml
Auto-merging vector/src/main/res/values-es/strings.xml
Auto-merging vector/src/main/res/values-es-rMX/strings.xml
Auto-merging vector/src/main/res/values-de/strings.xml
Auto-merging vector/src/main/res/values-ca/strings.xml
Auto-merging vector/src/main/res/values-bg/strings.xml
Auto-merging vector/src/main/res/layout/activity_vector_media_picker.xml
Auto-merging vector/src/main/java/im/vector/ui/themes/ThemeUtils.kt
Auto-merging vector/src/main/java/im/vector/push/PushManager.java
Removing vector/src/main/java/im/vector/fragments/VectorReadReceiptsDialogFragment.java
Removing vector/src/main/java/im/vector/adapters/VectorReadReceiptsAdapter.java
Removing vector/src/appfdroid/java/im/vector/gcm/GCMHelper.java
Auto-merging vector/src/app/java/im/vector/push/fcm/VectorFirebaseMessagingService.java
Removing vector/src/app/java/im/vector/gcm/MatrixInstanceIDListenerService.java
Removing vector/src/app/java/im/vector/gcm/GCMHelper.java
Automatic merge failed; fix conflicts and then commit the result. (1)
6 years ago
User avatar bmarty

Component locked

[Deprecated] Riot Android / [DEPRECATED] matrix-android-sdk

Component locked 6 years ago
User avatar bmarty

Component locked

[Deprecated] Riot Android / [DEPRECATED] Riot Android

Component locked 6 years ago
User avatar bmarty

Component unlocked

[Deprecated] Riot Android / [DEPRECATED] matrix-android-sdk

Component unlocked 6 years ago
User avatar bmarty

Component unlocked

[Deprecated] Riot Android / [DEPRECATED] Riot Android

Component unlocked 6 years ago
User avatar bmarty

Merged repository

[Deprecated] Riot Android / [DEPRECATED] matrix-android-sdk

Merged repository 6 years ago
User avatar bmarty

Merged repository

[Deprecated] Riot Android / [DEPRECATED] Riot Android

Merged repository 6 years ago
User avatar bmarty

Pushed changes

[Deprecated] Riot Android / [DEPRECATED] matrix-android-sdk

Pushed changes 6 years ago
User avatar bmarty

Pushed changes

[Deprecated] Riot Android / [DEPRECATED] Riot Android

Pushed changes 6 years ago
User avatar bmarty

Failed merge on repository

[Deprecated] Riot Android / [DEPRECATED] matrix-android-sdk 

Removing matrix-sdk/src/main/res/values/dimens.xml
Auto-merging matrix-sdk/src/main/res/values-pl/strings.xml
Auto-merging matrix-sdk/src/main/res/values-ja/strings.xml
CONFLICT (add/add): Merge conflict in matrix-sdk/src/main/res/values-ja/strings.xml
Removing matrix-sdk/src/main/res/drawable-xxhdpi/matrix_user.png
Automatic merge failed; fix conflicts and then commit the result. (1)
6 years ago

Search