consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merges master and fix conflicts

Browse Source
This commit is contained in:
kikito
2015-08-26 14:48:16 +02:00
parent c9ca3877e8 a2b240c360
commit 25c3c4d1f1
44 changed files with 385 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/locales/en.yml
View File

@@ -133,8 +133,8 @@ en:
shared:
tags_cloud:
tags: Topics
flag_as_inappropiate: Flag as inappropiate
undo_flag_as_inappropiate: Undo flag as inappropiate
flag_as_inappropiate: Flag as inappropriate
undo_flag_as_inappropiate: Undo flag
collective: Collective
mailer:
comment: