diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-05-03 16:53:32 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-05-03 16:53:32 +0000 |
| commit | e341354cc7d3d83982ff5983b3433c35fc044bbf (patch) | |
| tree | cdfc0e1ce7e0d96eb655f01a1f8516e5815ee0b4 /src/components/user_settings/user_settings.vue | |
| parent | 68cb614db960082e94c9631608d8461043371ba3 (diff) | |
| parent | 099a37483e5076714c7a6be5c6b9c7d546de5947 (diff) | |
Merge branch 'develop' into 'develop'
Add favicon to pleroma-fe
See merge request pleroma/pleroma-fe!248
Diffstat (limited to 'src/components/user_settings/user_settings.vue')
0 files changed, 0 insertions, 0 deletions