Merge remote-tracking branch 'upstream/master' into addtagaloglang · JabRef/jabref@cde33ac · GitHub

Commit

Merge remote-tracking branch 'upstream/master' into addtagaloglang

Browse files

* upstream/master:
  New Crowdin translations (#3794)
  Add Tagalog/Filipino as supported language (#3795)

# Conflicts:
#	src/main/resources/l10n/JabRef_tl.properties
#	src/main/resources/l10n/Menu_tl.properties

Loading branch information

Siedlerchr committed Mar 2, 2018

2 parents c3678fb + 8047402 commit cde33ac