aboutsummaryrefslogtreecommitdiffstats
path: root/servo/views/api.py
diff options
context:
space:
mode:
authorFilipp Lepalaan <filipp@mac.com>2016-05-01 23:54:58 +0300
committerFilipp Lepalaan <filipp@mac.com>2016-05-01 23:54:58 +0300
commit47cc21441b437fe148c72bd181059728b47bdf9b (patch)
treecd96c0a704cb31837c6e0b2e9affe998d24acd7b /servo/views/api.py
parent65df597329bbb602dd382695c639aab3776123ea (diff)
parent82e1fe63447f5c4d33d8a3ed7c365e7eab1006c0 (diff)
downloadServo-47cc21441b437fe148c72bd181059728b47bdf9b.tar.gz
Servo-47cc21441b437fe148c72bd181059728b47bdf9b.tar.bz2
Servo-47cc21441b437fe148c72bd181059728b47bdf9b.zip
Merge branch 'develop'
Diffstat (limited to 'servo/views/api.py')
-rw-r--r--servo/views/api.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/servo/views/api.py b/servo/views/api.py
index 9d2ba76..c8253bc 100644
--- a/servo/views/api.py
+++ b/servo/views/api.py
@@ -309,7 +309,7 @@ def warranty(request):
try:
GsxAccount.default(request.user)
except Exception as e:
- return error('Cannot connect to GSX (check user name and password)')
+ return error('Cannot connect to GSX (check username and password)')
try:
result = Device.from_gsx(sn, cached=False)