sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-14 07:52:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'crookedneighbor-add-quick-reply-string' into develop

Browse source 
Conflicts:
	locales/en/groups.json
This commit is contained in:
Tyler Renelle 2014-11-24 18:11:18 -07:00
commit 04b8e889f3
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
locales/en/groups.json
View file

@ -81,5 +81,6 @@
"clearAllPopover": "Delete all messages",
"optOutPopover": "Don't like private messages? Click to completely opt out",
"block": "Block",
"unblock": "Un-block"
"unblock": "Un-block",
"pm-reply": "Send a reply"
}