User avatar bmarty

Failed merge on repository

[Deprecated] Riot Android / [DEPRECATED] Riot Android 

Auto-merging 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-ru/strings.xml
Auto-merging vector/src/main/res/values-pt-rBR/strings.xml
Auto-merging vector/src/main/res/values-nn/strings.xml
Auto-merging vector/src/main/res/values-nl/strings.xml
Auto-merging vector/src/main/res/values-ja/strings.xml
Auto-merging vector/src/main/res/values-it/strings.xml
Auto-merging vector/src/main/res/values-id/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
CONFLICT (content): Merge conflict in vector/src/main/res/values-es/strings.xml
Auto-merging vector/src/main/res/values-de/strings.xml
Auto-merging vector/src/main/res/values-bg/strings.xml
Removing vector/src/main/res/layout/ssl_fingerprint_prompt.xml
Removing vector/src/main/res/layout/fragment_dialog_accounts_list.xml
Auto-merging vector/src/main/res/layout/dialog_select_text_size.xml
Removing vector/src/main/res/layout/dialog_licenses_header.xml
Removing vector/src/main/res/layout/dialog_licenses.xml
Auto-merging vector/src/main/res/layout/dialog_encryption_info.xml
Auto-merging vector/src/main/res/layout/dialog_device_verify.xml
Auto-merging vector/src/main/res/layout/dialog_device_details.xml
Auto-merging vector/src/main/res/layout/dialog_device_delete.xml
Auto-merging vector/src/main/res/layout/dialog_change_password.xml
Auto-merging vector/src/main/res/layout/dialog_base_edit_text.xml
Removing vector/src/main/res/drawable-xxhdpi/ic_material_call_end_black.png
Auto-merging vector/src/main/java/im/vector/features/hhs/ResourceLimitErrorFormatter.kt
Auto-merging vector/src/main/java/im/vector/features/hhs/ResourceLimitDialogHelper.kt
Auto-merging vector/src/main/java/im/vector/extensions/MatrixSdkExtensions.kt
Removing vector/src/appfdroid/AndroidManifest.xml
Removing build_matrix_sdk_lib_develop.sh
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

Pushed changes

[Deprecated] Riot Android / [DEPRECATED] Riot Android

Pushed changes 6 years ago
User avatar bmarty

Translation changed

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

%1$s %2$s ago
%1$s %2$s yang lalu
6 years ago
User avatar bmarty

Translation changed

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

%1$s now
%1$s sekarang
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

Merged repository

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

Merged repository 6 years ago
User avatar bmarty

Pushed changes

[Deprecated] Riot Android / [DEPRECATED] Riot Android

Pushed changes 6 years ago
User avatar bmarty

Resource update

[Deprecated] Riot Android / [DEPRECATED] Riot Android — Chinese (Traditional)

Resource update 6 years ago
User avatar bmarty

Resource update

[Deprecated] Riot Android / [DEPRECATED] Riot Android — Chinese (Simplified)

Resource update 6 years ago
User avatar bmarty

Resource update

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

Resource update 6 years ago
User avatar bmarty

Resource update

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

Resource update 6 years ago
User avatar bmarty

Resource update

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

Resource update 6 years ago
User avatar bmarty

Resource update

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

Resource update 6 years ago
User avatar bmarty

Resource update

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

Resource update 6 years ago

Search