git.ipfire.org Git - ipfire-2.x.git/commit - doc/language_issues.ru

]> git.ipfire.org Git - ipfire-2.x.git/commit - doc/language_issues.ru

projects / ipfire-2.x.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b2e7544 49abe7a)

author	Michael Tremer <michael.tremer@ipfire.org>
	Sun, 11 May 2014 16:47:11 +0000 (18:47 +0200)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Sun, 11 May 2014 16:47:11 +0000 (18:47 +0200)
commit	661cd276b68c274ecfee7cdf3bd6c7204dc56572
tree	48f6625ce5c24753cb4b69783dde5722025c4824	tree \| snapshot
parent	b2e75449a98f19e47b8aaf7623a6299749b21de6	commit \| diff
parent	49abe7afb1868315b96643afe08c12fa1b339e3a	commit \| diff

Merge remote-tracking branch 'ummeegge/openvpn' into next

Conflicts:
html/cgi-bin/ovpnmain.cgi
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl

12 files changed:

doc/language_issues.de	diff1 \|	diff2 \|	blob \| history
doc/language_issues.en	diff1 \|	diff2 \|	blob \| history
doc/language_issues.es	diff1 \|	diff2 \|	blob \| history
doc/language_issues.fr	diff1 \|	diff2 \|	blob \| history
doc/language_issues.nl	diff1 \|	diff2 \|	blob \| history
doc/language_issues.pl	diff1 \|	diff2 \|	blob \| history
doc/language_issues.ru	diff1 \|	diff2 \|	blob \| history
doc/language_issues.tr	diff1 \|	diff2 \|	blob \| history
doc/language_missings	diff1 \|	diff2 \|	blob \| history
html/cgi-bin/ovpnmain.cgi	diff1 \|	diff2 \|	blob \| history
langs/de/cgi-bin/de.pl	diff1 \|	diff2 \|	blob \| history
langs/en/cgi-bin/en.pl	diff1 \|	diff2 \|	blob \| history

IPFire 2.x development tree