Restoring the labels for spanish english only
Restoring the labels for spanish english only
Merge branch 'master' of https://github.com/Eforcers/inbox-cleaner

Conflicts:
	src/inbox/helpers.py
	src/inbox/views.py
Merge branch 'master' of https://github.com/Eforcers/inbox-cleaner

Conflicts:
	src/inbox/helpers.py
	src/inbox/views.py
Merge branch 'master' of https://github.com/Eforcers/inbox-cleaner

Conflicts:
	src/inbox/helpers.py
	src/inbox/views.py