aboutsummaryrefslogtreecommitdiff
path: root/src/main.js
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-04-12 15:47:51 +0000
committerlambda <pleromagit@rogerbraun.net>2018-04-12 15:47:51 +0000
commitde4664a2ac70636b74490a9f4101657fb836c43b (patch)
treee4a24ca08389a1eb4ed411db3234d9dec5fff643 /src/main.js
parentd49e2110601d4cc3f3bae3c91293b9bea8751834 (diff)
parentad0fd9f8f27478ff612d65b65f5aef69a7d4c403 (diff)
Merge branch 'patch-2' into 'develop'
[i18n] Update OC: colour settings. See merge request pleroma/pleroma-fe!227
Diffstat (limited to 'src/main.js')
0 files changed, 0 insertions, 0 deletions