Skip to content

Commit

Permalink
Merge remote-tracking branch 'weblate/master'
Browse files Browse the repository at this point in the history 
Conflicts:
	po/es.po
	po/fi.po
	po/sl.po
	po/tr.po
  • Loading branch information
@nijel
nijel committed Apr 26, 2012
2 parents b2236cf + 597593c commit 001210e
Show file tree
Hide file tree
Showing 4 changed files with 134 additions and 161 deletions.

0 comments on commit 001210e

Please sign in to comment.