remove_avatar_2.0

Commit

6 years ago

Merge branches 'develop' and 't3chguy/remove_avatar_2.0' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/remove_avatar_2.0 Conflicts: res/css/views/settings/_ProfileSettings.scss

References

#3733 - Implement new design for uploading/removing avatars

Author

t3chguy

Parents

6f5ac780

3ec60b16

matrix-react-sdk bf06b1f3 - Merge branches 'develop' and 't3chguy/remove_avatar_2.0' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/remove_avatar_2.0

matrix-react-sdk
bf06b1f3 - Merge branches 'develop' and 't3chguy/remove_avatar_2.0' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/remove_avatar_2.0