Skip to content

CIRCLE3 / cloud

Go to a project
You need to sign in or sign up before continuing.
Commit 1bf5af6b by Karsa Zoltán István
Options

Merge branch 'hotplug' into 'master' 

fix bug

See merge request !23
parents a4e70a81 b4841f40
Showing with 0 additions and 6 deletions
circle/locale/hu/LC_MESSAGES/django.po
......@@ -699,13 +699,7 @@ msgstr "E-mail értesítések"
msgid "Whether user wants to get digested email notifications."
msgstr "A felhasználó kéri-e tömbösített e-mail értesítések küldését."
<<<<<<< HEAD
#: dashboard/models.py:204
#, fuzzy
#| msgid "Latest modifications"
=======
#: dashboard/models.py:195
>>>>>>> 4d2c281d9c634f23b856d01444ee968725e6a018
msgid "Desktop notifications"
msgstr "Asztali értesítések"
......
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 sign in to comment