| 
						
					 | 
					
						
						
							
						
						2cb1e8ffc4
					 | 
					
						
						
							
							docs/guide-ja/structure-assets.md - updated [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-02-19 07:55:10 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d19224a40c
					 | 
					
						
						
							
							docs/guide-ja/output reviewed [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-02-17 08:12:14 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7bf8a048cd
					 | 
					
						
						
							
							docs/guide-ja/output reviewing [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-02-17 08:12:13 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						595b51102b
					 | 
					
						
						
							
							docs/guide-ja - uses 「接頭辞」 for "prefix" [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-02-15 22:20:23 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0f642aba20
					 | 
					
						
						
							
							docs/guide-ja update [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-02-15 22:20:23 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9f73e5aca7
					 | 
					
						
						
							
							docs/guide-ja/input - revised a bit [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-02-12 08:16:09 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						df7e5400ed
					 | 
					
						
						
							
							docs/guide-ja/input - reviewing [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-02-12 08:16:09 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						995a0daa17
					 | 
					
						
						
							
							docs/guide-ja/db-migrations.md - small fixes [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-02-11 12:58:53 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						52d1f622db
					 | 
					
						
						
							
							docs/guide-ja/db-active-record.md - minor fixes [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-02-11 12:58:53 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bac9f132e4
					 | 
					
						
						
							
							docs/guide-ja/db-query-builder.md - minor fixes [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-02-11 12:58:52 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c99284ef71
					 | 
					
						
						
							
							docs/guide-ja/db-dao.md - minor fixes [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-02-11 12:58:51 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						965f748bda
					 | 
					
						
						
							
							docs/guide-ja/concept-components.md - typo fixed [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-02-10 07:27:37 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						06fdfa977e
					 | 
					
						
						
							
							docs/guide-ja/concept-di-container.md - revised [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-02-10 07:27:12 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						81fcab59f2
					 | 
					
						
						
							
							docs/guide-ja/concept small changes [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-02-10 07:27:11 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e7f770ed68
					 | 
					
						
						
							
							docs/guide-ja/concept - minor fixes [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-02-10 07:27:10 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9d59c47a8d
					 | 
					
						
						
							
							Fixes #7121
						
						
						
						
						
						
					 | 
					
						2015-02-09 19:13:55 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d3bc0b3341
					 | 
					
						
						
							
							Fixes #7163 [skip ci]
						
						
						
						
						
						
					 | 
					
						2015-02-04 21:05:56 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ec64132a0e
					 | 
					
						
						
							
							docs/guide-ja/runtime - reviewed [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-02-03 18:32:50 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						84976bd74c
					 | 
					
						
						
							
							docs/guide-ja/runtime - review [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-02-03 18:32:50 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						246fe4728c
					 | 
					
						
						
							
							docs/guide-ja/structure - review completed [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-02-01 01:41:26 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4bb175a487
					 | 
					
						
						
							
							docs/guide-ja/structure-widgets.md - revised [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-01-31 13:31:11 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1dd572a36e
					 | 
					
						
						
							
							docs/guide-ja/structure-filters.md - revised [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-01-31 13:31:11 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						424cd940ea
					 | 
					
						
						
							
							docs/guide-ja/structure-modules.md - refined [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-01-31 13:31:10 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f781869b87
					 | 
					
						
						
							
							docs/guide-ja "既定" を "デフォルト" に変更 [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-01-31 13:31:09 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b55fc2cbcb
					 | 
					
						
						
							
							docs/guide-ja/concept-events.md - typo fixed [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-01-31 13:31:09 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f210d79206
					 | 
					
						
						
							
							docs/guide-ja - "organize" の訳語を "組織" "整理" から "編成" に変更
						
						
						
						
						
						
					 | 
					
						2015-01-31 13:31:08 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						259eb1ae5e
					 | 
					
						
						
							
							docs/guide-ja/structure-views.md - revised [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-01-31 11:51:04 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8e725955d3
					 | 
					
						
						
							
							docs/guide-ja changed "コンテンツ" to "コンテント" [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-01-31 11:51:03 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6cf328569b
					 | 
					
						
						
							
							docs/guide-ja/tutorial-advanced-app.md - updated [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-01-30 21:44:02 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fcaabbc24c
					 | 
					
						
						
							
							docs/guide-ja/input updated [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-01-30 21:44:02 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						179eea64dd
					 | 
					
						
						
							
							docs/guide-ja/structure-models.md - revised [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-01-30 21:44:01 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d74c6f0f2f
					 | 
					
						
						
							
							docs/guide-ja updated [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-01-27 01:46:34 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6f12a14328
					 | 
					
						
						
							
							use id instead of name for anchor references in the guide
						
						
						
						
						
						
						
						fixes #7013
Conflicts:
	docs/guide-es/caching-data.md
	docs/guide-es/caching-fragment.md
	docs/guide-es/caching-http.md
	docs/guide-es/concept-aliases.md
	docs/guide-es/concept-autoloading.md
	docs/guide-es/concept-behaviors.md
	docs/guide-es/concept-configurations.md
	docs/guide-es/concept-di-container.md
	docs/guide-es/concept-events.md
	docs/guide-es/db-dao.md
	docs/guide-es/helper-array.md
	docs/guide-es/helper-html.md
	docs/guide-es/helper-overview.md
	docs/guide-es/rest-authentication.md
	docs/guide-es/rest-controllers.md
	docs/guide-es/rest-error-handling.md
	docs/guide-es/rest-quick-start.md
	docs/guide-es/rest-resources.md
	docs/guide-es/rest-response-formatting.md
	docs/guide-es/runtime-handling-errors.md
	docs/guide-es/runtime-logging.md
	docs/guide-es/runtime-requests.md
	docs/guide-es/runtime-responses.md
	docs/guide-es/runtime-routing.md
	docs/guide-es/runtime-sessions-cookies.md
	docs/guide-es/start-databases.md
	docs/guide-es/start-forms.md
	docs/guide-es/start-gii.md
	docs/guide-es/start-hello.md
	docs/guide-es/start-installation.md
	docs/guide-es/start-workflow.md
	docs/guide-es/structure-application-components.md
	docs/guide-es/structure-applications.md
	docs/guide-es/structure-assets.md
	docs/guide-es/structure-controllers.md
	docs/guide-es/structure-entry-scripts.md
	docs/guide-es/structure-extensions.md
	docs/guide-es/structure-filters.md
	docs/guide-es/structure-models.md
	docs/guide-es/structure-modules.md
	docs/guide-es/structure-views.md
	docs/guide-es/structure-widgets.md
	docs/guide-es/tutorial-core-validators.md
	docs/guide-es/tutorial-yii-integration.md
	docs/guide-fr/start-databases.md
	docs/guide-fr/start-forms.md
	docs/guide-fr/start-gii.md
	docs/guide-fr/start-hello.md
	docs/guide-fr/start-installation.md
	docs/guide-fr/start-workflow.md
	docs/guide-fr/structure-entry-scripts.md
	docs/guide-it/start-installation.md
	docs/guide-ja/structure-application-components.md
	docs/guide-ja/structure-applications.md
	docs/guide-ja/structure-controllers.md
	docs/guide-pt-BR/start-databases.md
	docs/guide-pt-BR/start-forms.md
	docs/guide-pt-BR/start-gii.md
	docs/guide-pt-BR/start-hello.md
	docs/guide-pt-BR/start-installation.md
	docs/guide-pt-BR/start-workflow.md
	docs/guide-pt-BR/structure-application-components.md
	docs/guide-pt-BR/structure-applications.md
	docs/guide-pt-BR/structure-assets.md
	docs/guide-pt-BR/structure-controllers.md
	docs/guide-pt-BR/structure-entry-scripts.md
	docs/guide-pt-BR/structure-extensions.md
	docs/guide-pt-BR/structure-filters.md
	docs/guide-pt-BR/structure-models.md
	docs/guide-pt-BR/structure-modules.md
	docs/guide-pt-BR/structure-views.md
	docs/guide-pt-BR/structure-widgets.md
	docs/guide-ru/caching-data.md
	docs/guide-ru/caching-fragment.md
	docs/guide-ru/caching-http.md
	docs/guide-ru/concept-aliases.md
	docs/guide-ru/concept-autoloading.md
	docs/guide-ru/concept-behaviors.md
	docs/guide-ru/concept-configurations.md
	docs/guide-ru/concept-di-container.md
	docs/guide-ru/concept-events.md
	docs/guide-ru/input-validation.md
	docs/guide-ru/rest-authentication.md
	docs/guide-ru/rest-controllers.md
	docs/guide-ru/rest-quick-start.md
	docs/guide-ru/rest-resources.md
	docs/guide-ru/rest-response-formatting.md
	docs/guide-ru/runtime-requests.md
	docs/guide-ru/runtime-responses.md
	docs/guide-ru/start-databases.md
	docs/guide-ru/start-forms.md
	docs/guide-ru/start-gii.md
	docs/guide-ru/start-hello.md
	docs/guide-ru/start-installation.md
	docs/guide-ru/start-workflow.md
	docs/guide-ru/structure-application-components.md
	docs/guide-ru/structure-applications.md
	docs/guide-ru/structure-controllers.md
	docs/guide-ru/structure-entry-scripts.md
	docs/guide-ru/structure-extensions.md
	docs/guide-ru/structure-filters.md
	docs/guide-ru/structure-modules.md
	docs/guide-ru/structure-views.md
	docs/guide-ru/structure-widgets.md
	docs/guide-ru/tutorial-core-validators.md
	docs/guide-ru/tutorial-i18n.md
	docs/guide-ru/tutorial-yii-integration.md
	docs/guide-uk/caching-fragment.md
	docs/guide-uk/concept-aliases.md
	docs/guide-uk/concept-autoloading.md
	docs/guide-uk/start-databases.md
	docs/guide-uk/start-forms.md
	docs/guide-uk/start-gii.md
	docs/guide-uk/start-hello.md
	docs/guide-uk/start-installation.md
	docs/guide-uk/start-workflow.md
	docs/guide-uk/structure-application-components.md
	docs/guide-uk/structure-applications.md
	docs/guide-uk/structure-controllers.md
	docs/guide-uk/structure-entry-scripts.md
	docs/guide-zh-CN/caching-data.md
	docs/guide-zh-CN/caching-fragment.md
	docs/guide-zh-CN/caching-http.md
	docs/guide-zh-CN/concept-aliases.md
	docs/guide-zh-CN/concept-autoloading.md
	docs/guide-zh-CN/concept-configurations.md
	docs/guide-zh-CN/concept-di-container.md
	docs/guide-zh-CN/input-validation.md
	docs/guide-zh-CN/output-formatter.md
	docs/guide-zh-CN/rest-quick-start.md
	docs/guide-zh-CN/rest-response-formatting.md
	docs/guide-zh-CN/runtime-handling-errors.md
	docs/guide-zh-CN/runtime-responses.md
	docs/guide-zh-CN/runtime-routing.md
	docs/guide-zh-CN/runtime-sessions-cookies.md
	docs/guide-zh-CN/start-databases.md
	docs/guide-zh-CN/start-forms.md
	docs/guide-zh-CN/start-gii.md
	docs/guide-zh-CN/start-hello.md
	docs/guide-zh-CN/start-installation.md
	docs/guide-zh-CN/start-workflow.md
	docs/guide-zh-CN/structure-application-components.md
	docs/guide-zh-CN/structure-applications.md
	docs/guide-zh-CN/structure-assets.md
	docs/guide-zh-CN/structure-controllers.md
	docs/guide-zh-CN/structure-entry-scripts.md
	docs/guide-zh-CN/structure-extensions.md
	docs/guide-zh-CN/structure-filters.md
	docs/guide-zh-CN/structure-models.md
	docs/guide-zh-CN/structure-modules.md
	docs/guide-zh-CN/structure-views.md
	docs/guide-zh-CN/structure-widgets.md
	docs/guide-zh-CN/tutorial-core-validators.md
	docs/guide-zh-CN/tutorial-yii-integration.md
	extensions/apidoc/helpers/ApiMarkdown.php
	extensions/apidoc/templates/html/views/constSummary.php
	extensions/apidoc/templates/html/views/type.php
Conflicts:
	docs/guide-ja/structure-application-components.md 
						
						
					 | 
					
						2015-01-27 01:46:33 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dc9514059c
					 | 
					
						
						
							
							docs/guide-ja/structure-controllers.md - reviewd [ci skip]
						
						
						
						
						
						
						
						Conflicts:
	docs/guide-ja/structure-controllers.md 
						
						
					 | 
					
						2015-01-27 01:45:52 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						feac9c7fd8
					 | 
					
						
						
							
							docs/guide-ja/structure-* review WIP [ci skip]
						
						
						
						
						
						
						
						Conflicts:
	docs/guide-ja/structure-application-components.md
	docs/guide-ja/structure-applications.md 
						
						
					 | 
					
						2015-01-27 01:42:23 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						36bebbfefb
					 | 
					
						
						
							
							use id instead of name for anchor references in the guide
						
						
						
						
						
						
						
						fixes #7013 
						
						
					 | 
					
						2015-01-25 22:13:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2c2fb70f94
					 | 
					
						
						
							
							Fixes #6998: Fixed model name in screenshots of Gii CRUD
						
						
						
						
						
						
					 | 
					
						2015-01-24 21:34:40 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						acf34f3ffc
					 | 
					
						
						
							
							docs/guide-ja/start-* refined [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-01-24 11:18:54 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f647b65a55
					 | 
					
						
						
							
							docs/guide-ja/intro-upgrade-from-v1.md - refined [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-01-23 21:37:35 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d0ab9f5d90
					 | 
					
						
						
							
							docs/guide-ja/intro-yii.md - refined [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-01-23 21:37:34 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a85c751cbf
					 | 
					
						
						
							
							docs/guide-ja/README.md - revised [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-01-23 21:37:33 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b4cac987cc
					 | 
					
						
						
							
							docs/guide-ja/db-dao.md - updated [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-01-22 23:38:17 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a225754cfd
					 | 
					
						
						
							
							docs/guide-ja/db-dao.md - WIP [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-01-22 23:38:17 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4e5a1313ac
					 | 
					
						
						
							
							docs/guide-ja small updatas [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-01-22 23:38:16 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e728600d50
					 | 
					
						
						
							
							docs/guide-ja/README.md - updated [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-01-20 20:22:07 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						beb6632399
					 | 
					
						
						
							
							docs/guide-ja/security-auth-clients.md - completed
						
						
						
						
						
						
					 | 
					
						2015-01-20 20:22:06 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c0ba7d5ed7
					 | 
					
						
						
							
							docs/guide-ja/security-auth-clients.md - WIP [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-01-20 20:22:06 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2f924bf183
					 | 
					
						
						
							
							docs/guide-ja/security-auth-clients.md - translation WIP [ci skip]
						
						
						
						
						
						
						
						Conflicts:
	docs/internals-ja/design-decisions.md 
						
						
					 | 
					
						2015-01-20 20:21:19 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						abda4a7337
					 | 
					
						
						
							
							docs/guide-ja/helper-url.md - added [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-01-13 23:43:34 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a7e06d8464
					 | 
					
						
						
							
							docs/guide-ja/helper-html.md - added [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-01-13 22:03:26 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |