開発 #31202
プラン強化プロジェクト > wiki機能 > Wiki一覧画面改修
Fix Conflicts:
	portlets/wiki/src/main/webapp/WEB-INF/templates/vm/portlets/html/ja/wiki-widgets.vm
	portlets/wiki/src/main/webapp/WEB-INF/templates/vm/portlets/html/wiki-widgets.vm
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_de.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_el.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_en.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_es.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_fr.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_it.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_ja.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_ko.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_my.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_nl.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_no.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_pl.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_pt.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_tr.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_zh.properties
Fix Conflicts:
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_de.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_el.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_en.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_es.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_fr.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_it.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_ja.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_ko.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_my.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_nl.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_no.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_pl.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_pt.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_tr.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_zh.properties
Merge branch 'features/wiki-style-modify' of https://github.com/aipocom/aipo.git into features/wiki-style-modify