Skip to content

Commit

Permalink
Merge remote-tracking branch 'aetherseed/AetherSeed-patch-2' into master
Browse files Browse the repository at this point in the history 
Conflicts:
	lang/eo/strings.po
  • Loading branch information
@djuretic
djuretic committed Jul 12, 2017
2 parents 127c378 + 35d3776 commit abf1ecf
Showing 1 changed file with 221 additions and 216 deletions.
Loading

0 comments on commit abf1ecf

Please sign in to comment.