]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - js/util.js
Merge branch 'drop_corporate_text' into 'nightly'
authormmn <mmn@hethane.se>
Sat, 20 Jun 2015 22:48:31 +0000 (22:48 +0000)
committermmn <mmn@hethane.se>
Sat, 20 Jun 2015 22:48:31 +0000 (22:48 +0000)
commitee9176f20dbc0571f3f5875f9c08d9bb68635e56
tree6040bfbb5771073fe081bbdeed6000cbc6d8d282
parent1d111533960686a86776f1f8a2c5d583e11792e5
parent267a49103e3527395cd2f8f3a87612d38c9eee6a
Merge branch 'drop_corporate_text' into 'nightly'

Drop corporate text plus minor rewording

Following [this discussion](https://gnusocial.no/conversation/190441#notice-190441) I only fixed corporate-only occurrences. I suggest People instead of User directory. Moreover I fixed a minor inconsistency (Trends should be preferred to Trending topics).

The full locale folder should be fixed once we have digitaldreamer's feedback. But we can at least start from this.

See merge request !16