diff options
author | Marko Pušnik <marko.pusnik@guru.si> | 2015-10-13 15:43:10 +0200 |
---|---|---|
committer | Marko Pušnik <marko.pusnik@guru.si> | 2015-10-13 15:43:10 +0200 |
commit | 6aabe80831ead5390aff3ae8e73691f0600ca880 (patch) | |
tree | f506261cf064c6a518410c63e36b1bbbdbbe5544 /res/en.json | |
parent | 8855c93594c4eca1d0c5d3e2f9f2b35cc7d420a1 (diff) | |
parent | 81f79c04796ad2ba0d48fda0e0fcdc812c476817 (diff) |
Merge branch 'master' of ssh://212.235.189.51:22122/codeq-web
Conflicts:
index.html
Diffstat (limited to 'res/en.json')
-rw-r--r-- | res/en.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/res/en.json b/res/en.json index 1a41876..0eade46 100644 --- a/res/en.json +++ b/res/en.json @@ -1,5 +1,6 @@ { "language": "Language", + "robot_address": "Robot’s IP address", "problem_list": "Problems", "python": "Python", "prolog": "Prolog", |