diff options
| author | lambda <pleromagit@rogerbraun.net> | 2017-11-08 07:02:16 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2017-11-08 07:02:16 +0000 |
| commit | cdbcf569f8a5544b1c2d86e8adb616860f99c478 (patch) | |
| tree | 0e08a3bbe88b26b4570a374432b2267006801907 /src/components/user_settings | |
| parent | 7ab7ac7be63603f4637c75ed5424c045d4566b1f (diff) | |
| parent | 608d1e6776769b933e194f96b4892a888880f60f (diff) | |
Merge branch 'feature/blocks' into 'develop'
Add blocks.
See merge request pleroma/pleroma-fe!130
Diffstat (limited to 'src/components/user_settings')
0 files changed, 0 insertions, 0 deletions