Konrad Langenberg 30fe97a55e Merge branch 'master' of https://github.com/go-gitea/gitea ... Signed-off-by: Konrad <konrad@kola-entertainments.de> # Conflicts: # models/migrations/migrations.go # models/migrations/v46.go # models/repo.go # public/js/index.js		2017-10-30 21:17:36 +01:00
..
locale_bg-BG.ini	Resolved Conflicts	2017-09-12 14:19:20 +02:00
locale_cs-CZ.ini	Resolved Conflicts	2017-09-12 14:19:20 +02:00
locale_de-DE.ini	Resolved Conflicts	2017-09-12 14:19:20 +02:00
locale_en-US.ini	Merge branch 'master' of https://github.com/go-gitea/gitea	2017-10-30 21:17:36 +01:00
locale_es-ES.ini	Resolved Conflicts	2017-09-12 14:19:20 +02:00
locale_fi-FI.ini	Resolved Conflicts	2017-09-12 14:19:20 +02:00
locale_fr-FR.ini	Resolved Conflicts	2017-09-12 14:19:20 +02:00
locale_hu-HU.ini	Resolved Conflicts	2017-09-12 14:19:20 +02:00
locale_it-IT.ini	Resolved Conflicts	2017-09-12 14:19:20 +02:00
locale_ja-JP.ini	Resolved Conflicts	2017-09-12 14:19:20 +02:00
locale_ko-KR.ini	Resolved Conflicts	2017-09-12 14:19:20 +02:00
locale_lt-LT.ini	Resolved Conflicts	2017-09-12 14:19:20 +02:00
locale_lv-LV.ini	Resolved Conflicts	2017-09-12 14:19:20 +02:00
locale_nb-NO.ini	Resolved Conflicts	2017-09-12 14:19:20 +02:00
locale_nl-NL.ini	Resolved Conflicts	2017-09-12 14:19:20 +02:00
locale_pl-PL.ini	Resolved Conflicts	2017-09-12 14:19:20 +02:00
locale_pt-BR.ini	Resolved Conflicts	2017-09-12 14:19:20 +02:00
locale_ru-RU.ini	Resolved Conflicts	2017-09-12 14:19:20 +02:00
locale_sr-SP.ini	Resolved Conflicts	2017-09-12 14:19:20 +02:00
locale_sv-SE.ini	Resolved Conflicts	2017-09-12 14:19:20 +02:00
locale_tr-TR.ini	Resolved Conflicts	2017-09-12 14:19:20 +02:00
locale_zh-CN.ini	Resolved Conflicts	2017-09-12 14:19:20 +02:00
locale_zh-HK.ini	Resolved Conflicts	2017-09-12 14:19:20 +02:00
locale_zh-TW.ini	Resolved Conflicts	2017-09-12 14:19:20 +02:00
TRANSLATORS	Protected branches system (#339)	2017-02-21 23:02:10 +08:00