Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Faker::Educator "secondary" spelling #708

Merged
merged 2 commits into from
Dec 19, 2016
Merged

Fix Faker::Educator "secondary" spelling #708

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0f4fee
Fix Faker::Educator "secondary" spelling
gadtfly Sep 25, 2016
3b84a51
Merge branch 'master' into master
stympy Dec 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'master' into master
  • Loading branch information
@stympy
stympy committed Dec 19, 2016
commit 3b84a5173ef0bee87bb2142080d92d40c7f4aa97
2 changes: 1 addition & 1 deletion lib/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ en:

educator:
name: ['Marblewald', 'Mallowtown', 'Brookville', 'Flowerlake', 'Falconholt', 'Ostbarrow', 'Lakeacre', 'Clearcourt', 'Ironston', 'Mallowpond', 'Iceborough', 'Icelyn', 'Brighthurst', 'Bluemeadow', 'Vertapple', 'Ironbarrow']
secondary: ['High School', 'Secondary', 'High']
secondary: ['High School', 'Secondary College', 'High']
tertiary:
type: ['College', 'University', 'Technical College', 'TAFE']
course:
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.