client/views/avatar/avatar.html · a2135f65633b92c7429091290108f62e628783dc · RocketChat / Rocket.Chat · GitLab

Snippets Groups Projects

9 years ago
92eecb54
Merge branch 'features/avatar' of https://github.com/RocketChat/Rocket.Chat into features/avatar · 92eecb54
Marcelo Schmidt authored 9 years ago
```
Conflicts:
	client/views/avatar/avatar.html
```
92eecb54

History
Merge branch 'features/avatar' of https://github.com/RocketChat/Rocket.Chat into features/avatar
Marcelo Schmidt authored 9 years ago
```
Conflicts:
	client/views/avatar/avatar.html
```