Merge remote-tracking branch 'origin/master' into statistics

This commit is contained in:
Maximilian Grundke
2016-03-02 12:01:16 +01:00
27 changed files with 533 additions and 145 deletions

View File

@@ -1,6 +1,8 @@
en:
activerecord:
attributes:
code_harbor_link:
oauth2token: OAuth2 Token
consumer:
name: Name
oauth_key: OAuth Key
@@ -90,6 +92,9 @@ en:
internal_user_ids: Members
name: Name
models:
code_harbor_link:
one: CodeHarbor Link
other: CodeHarbor Links
consumer:
one: Consumer
other: Consumers