Skip to content

Commit 2d2c279

Browse files
0nko0nko
committed
Merge branch 'develop' into issue/201-image-blocks
# Conflicts: # aztec/src/main/java/org/wordpress/aztec/Html.java # aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecMediaSpan.kt # aztec/src/main/res/values/dimens.xml
2 parents 6870774 + 007a890 commit 2d2c279

File tree

56 files changed

+312
-198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+312
-198
lines changed

‎app/src/main/res/drawable-hdpi/ic_action_redo.png‎

-666 Bytes
Binary file not shown.

‎app/src/main/res/drawable-hdpi/ic_action_undo.png‎

-655 Bytes
Binary file not shown.

‎app/src/main/res/drawable-mdpi/ic_action_redo.png‎

-424 Bytes
Binary file not shown.

‎app/src/main/res/drawable-mdpi/ic_action_undo.png‎

-420 Bytes
Binary file not shown.

‎app/src/main/res/drawable-xhdpi/ic_action_redo.png‎

-834 Bytes
Binary file not shown.

‎app/src/main/res/drawable-xhdpi/ic_action_undo.png‎

-876 Bytes
Binary file not shown.

‎app/src/main/res/drawable-xxhdpi/ic_action_redo.png‎

-1.22 KB
Binary file not shown.

‎app/src/main/res/drawable-xxhdpi/ic_action_undo.png‎

-1.22 KB
Binary file not shown.

‎app/src/main/res/drawable-xxxhdpi/ic_action_redo.png‎

-1.82 KB
Binary file not shown.

‎app/src/main/res/drawable-xxxhdpi/ic_action_undo.png‎

-1.76 KB
Binary file not shown.

0 commit comments

Comments
 (0)