Commit def2ff20 authored by charliep's avatar charliep
Browse files

Merge remote-tracking branch 'origin/master'

parents ac5a377e b9817584
......@@ -113,7 +113,7 @@
<string name="refresh">Refresh</string>
<string name="scan">Scan</string>
<string name="about_field_day">About Field Day</string>
<string name="contributor_list">Contributors: Eli Ramthun, Charles Peck, Kristin Muterspaw, Nic Arnold, Chau Pham, Lillian Gray, Craig Earley, Tamara\</string>
<string name="contributor_list">Contributors: Eli Ramthun, Charles Peck, Kristin Muterspaw, Nic Arnold, Chau Pham, Lillian Gray, Craig Earley, Tamara Blagojevic\</string>
<string name="clean_menu_toggle">Clean or erase</string>
</resources>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment