Skip to content
Snippets Groups Projects
Commit 33945d75 authored by Andrew Dolgov's avatar Andrew Dolgov
Browse files

Merge branch 'master' of git://github.com/EyesX/Tiny-Tiny-RSS into EyesX-master 

Conflicts:
	locale/sv_SE/LC_MESSAGES/messages.mo
	locale/sv_SE/LC_MESSAGES/messages.po
parents f17c3ee2 9bc0a600
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
locale/sv_SE/LC_MESSAGES/messages.mo
+ 0
− 0
View file @ 33945d75
No preview for this file type
locale/sv_SE/LC_MESSAGES/messages.po
+ 962
− 983
View file @ 33945d75
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment