Correct column index name for nicedate
This has been manually merged.
Merge branch 'PennDutch'
Pennsylvania Dutch as a project language
Looks like the second one is a minor update to the first one. Ideally you would combine...
You shouldn't have needed to merge anything, just committed the new changes to your...
Don't escape quotes in team names
Merge branch 'odds_and_ends'