兰天游
							
						 
					 | 
					
						
						
							
						
						e1243f3d59
					 | 
					
						
						
							
							feat: add typings for metadata
						
						
						
						
						
						
							
						
					 | 
					
						2023-07-16 21:34:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yifei Zhang
							
						 
					 | 
					
						
						
							
						
						62f8cd1db6
					 | 
					
						
						
							
							Merge pull request #2406 from Yidadaa/bugfix-0716
						
						
						
						
						
						
						
						feat: close #2376 add babel polyfill 
						
						
							
						
					 | 
					
						2023-07-16 16:34:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yidadaa
							
						 
					 | 
					
						
						
							
						
						af5f67d459
					 | 
					
						
						
							
							feat: close #2376 add babel polyfill
						
						
						
						
						
						
							
						
					 | 
					
						2023-07-16 16:32:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yifei Zhang
							
						 
					 | 
					
						
						
							
						
						13424a893e
					 | 
					
						
						
							
							Merge pull request #2405 from Yidadaa/bugfix-0716
						
						
						
						
						
						
						
						fix: #2367 do not copy in async callback after sharing to ShareGPT 
						
						
							
						
					 | 
					
						2023-07-16 16:17:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yidadaa
							
						 
					 | 
					
						
						
							
						
						30473ec41e
					 | 
					
						
						
							
							fix: #2367 do not copy in async callback after sharing to ShareGPT
						
						
						
						
						
						
							
						
					 | 
					
						2023-07-16 16:14:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yifei Zhang
							
						 
					 | 
					
						
						
							
						
						24d382c70d
					 | 
					
						
						
							
							Merge pull request #2404 from Yidadaa/bugfix-0716
						
						
						
						
						
						
						
						feat: improve dnd icon 
						
						
							
						
					 | 
					
						2023-07-16 16:14:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yidadaa
							
						 
					 | 
					
						
						
							
						
						3ddedc903e
					 | 
					
						
						
							
							feat: improve dnd icon
						
						
						
						
						
						
							
						
					 | 
					
						2023-07-16 15:49:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yifei Zhang
							
						 
					 | 
					
						
						
							
						
						e3c279b8be
					 | 
					
						
						
							
							Merge pull request #2389 from MarkShawn2020/fix-default-openai-url
						
						
						
						
						
						
						
						fixed openai base url if empty 
						
						
							
						
					 | 
					
						2023-07-16 15:20:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yifei Zhang
							
						 
					 | 
					
						
						
							
						
						d909b676c5
					 | 
					
						
						
							
							Update README.md
						
						
						
						
						
						
							
						
					 | 
					
						2023-07-16 15:08:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yifei Zhang
							
						 
					 | 
					
						
						
							
						
						08a8ac9971
					 | 
					
						
						
							
							Merge pull request #2388 from yikayiyo/feat-drag-prompts
						
						
						
						
						
						
						
						feat: #2297 drag and drop in contextual prompts 
						
						
							
						
					 | 
					
						2023-07-16 14:30:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yifei Zhang
							
						 
					 | 
					
						
						
							
						
						7073fd2f3b
					 | 
					
						
						
							
							Merge pull request #2392 from imldy/dev_SetInjectSystemPrompts
						
						
						
						
						
						
						
						fix: enable `enableInjectSystemPrompts` attribute for old sessions 
						
						
							
						
					 | 
					
						2023-07-16 14:29:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								imldy
							
						 
					 | 
					
						
						
							
						
						a9f67a48a1
					 | 
					
						
						
							
							dev: use current inject configuration
						
						
						
						
						
						
							
						
					 | 
					
						2023-07-15 02:48:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								imldy
							
						 
					 | 
					
						
						
							
						
						fd058cc693
					 | 
					
						
						
							
							fix: enable enableInjectSystemPrompts attribute for old sessions
						
						
						
						
						
						
							
						
					 | 
					
						2023-07-15 01:32:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yifei Zhang
							
						 
					 | 
					
						
						
							
						
						c98df33003
					 | 
					
						
						
							
							Merge pull request #2390 from MarkShawn2020/fix-react-key
						
						
						
						
						
						
						
						fixed react key 
						
						
							
						
					 | 
					
						2023-07-15 01:28:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								markshawn2020
							
						 
					 | 
					
						
						
							
						
						3f8b14f5f8
					 | 
					
						
						
							
							fixed react key
						
						
						
						
						
						
							
						
					 | 
					
						2023-07-14 21:15:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								markshawn2020
							
						 
					 | 
					
						
						
							
						
						1c335a68e0
					 | 
					
						
						
							
							fixed openai base url if empty
						
						
						
						
						
						
							
						
					 | 
					
						2023-07-14 21:03:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								legao
							
						 
					 | 
					
						
						
							
						
						fb98050d9f
					 | 
					
						
						
							
							feat: drag and drop in contextual prompts
						
						
						
						
						
						
							
						
					 | 
					
						2023-07-14 18:08:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yifei Zhang
							
						 
					 | 
					
						
						
							
						
						91cb7aa13d
					 | 
					
						
						
							
							Merge pull request #2372 from Yidadaa/dependabot/npm_and_yarn/semver-6.3.1
						
						
						
						
						
						
						
						chore(deps): bump semver from 6.3.0 to 6.3.1 
						
						
							
						
					 | 
					
						2023-07-13 16:46:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dependabot[bot]
							
						 
					 | 
					
						
						
							
						
						ab0f7cc0c9
					 | 
					
						
						
							
							chore(deps): bump semver from 6.3.0 to 6.3.1
						
						
						
						
						
						
						
						Bumps [semver](https://github.com/npm/node-semver) from 6.3.0 to 6.3.1.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v6.3.1/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v6.3.0...v6.3.1)
---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com> 
						
						
							
						
					 | 
					
						2023-07-13 01:58:09 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yifei Zhang
							
						 
					 | 
					
						
						
							
						
						b51f7f9a25
					 | 
					
						
						
							
							Merge pull request #2370 from Yidadaa/bugfix-0712
						
						
						
						
						
						
						
						fix: sharegpt roles 
						
						
							
						
					 | 
					
						2023-07-12 23:21:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yidadaa
							
						 
					 | 
					
						
						
							
						
						d275e32e70
					 | 
					
						
						
							
							fix: sharegpt roles
						
						
						
						
						
						
							
						
					 | 
					
						2023-07-12 23:19:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yifei Zhang
							
						 
					 | 
					
						
						
							
						
						22cf78d506
					 | 
					
						
						
							
							Merge pull request #2355 from fyl080801/main
						
						
						
						
						
						
						
						fix: cloudflare headers 
						
						
							
						
					 | 
					
						2023-07-11 23:57:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yifei Zhang
							
						 
					 | 
					
						
						
							
						
						c7c318b31e
					 | 
					
						
						
							
							Merge pull request #2360 from imldy/fix_can't_edit_old_mask
						
						
						
						
						
						
						
						fix: 迁移面具对象的key以解决无法编辑旧面具的问题 
						
						
							
						
					 | 
					
						2023-07-11 23:48:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								imldy
							
						 
					 | 
					
						
						
							
						
						a4d012828c
					 | 
					
						
						
							
							fix: migrated mask object key
						
						
						
						
						
						
							
						
					 | 
					
						2023-07-11 21:02:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yuanliang feng
							
						 
					 | 
					
						
						
							
						
						72cfebd2bc
					 | 
					
						
						
							
							Merge pull request #3 from fyl080801/deploy
						
						
						
						
						
						
						
						Deploy 
						
						
							
						
					 | 
					
						2023-07-11 17:08:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yuanliang feng
							
						 
					 | 
					
						
						
							
						
						a832cfb343
					 | 
					
						
						
							
							Update common.ts
						
						
						
						
						
						
							
						
					 | 
					
						2023-07-11 15:46:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yuanliang feng
							
						 
					 | 
					
						
						
							
						
						9ef680db57
					 | 
					
						
						
							
							Merge pull request #2 from fyl080801/main
						
						
						
						
						
						
						
						update 
						
						
							
						
					 | 
					
						2023-07-10 23:35:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yuanliang feng
							
						 
					 | 
					
						
						
							
						
						2c09f4ef90
					 | 
					
						
						
							
							Merge pull request #1 from fyl080801/main
						
						
						
						
						
						
						
						update 
						
						
							
						
					 | 
					
						2023-07-10 23:23:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yifei Zhang
							
						 
					 | 
					
						
						
							
						
						c44454bf74
					 | 
					
						
						
							
							Merge pull request #2346 from Yidadaa/bugfix-0710
						
						
						
						
						
						
						
						fix: #2336 resending message should delete origional messages 
						
						
							
						
					 | 
					
						2023-07-10 23:22:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yidadaa
							
						 
					 | 
					
						
						
							
						
						ad1b9b7f6d
					 | 
					
						
						
							
							fixup
						
						
						
						
						
						
							
						
					 | 
					
						2023-07-10 23:21:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yidadaa
							
						 
					 | 
					
						
						
							
						
						15e063e1b5
					 | 
					
						
						
							
							feat: #2330 disable /list/models
						
						
						
						
						
						
							
						
					 | 
					
						2023-07-10 23:19:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yidadaa
							
						 
					 | 
					
						
						
							
						
						c00a63e4c3
					 | 
					
						
						
							
							fix: #2336 resending message should delete origional messages
						
						
						
						
						
						
							
						
					 | 
					
						2023-07-10 22:59:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yifei Zhang
							
						 
					 | 
					
						
						
							
						
						dbda27b1d6
					 | 
					
						
						
							
							Merge pull request #2343 from Yidadaa/dependabot/npm_and_yarn/next-13.4.9
						
						
						
						
						
						
						
						chore(deps): bump next from 13.4.6 to 13.4.9 
						
						
							
						
					 | 
					
						2023-07-10 21:52:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yifei Zhang
							
						 
					 | 
					
						
						
							
						
						9eef879dbe
					 | 
					
						
						
							
							Merge pull request #2342 from Yidadaa/dependabot/npm_and_yarn/tauri-apps/cli-1.4.0
						
						
						
						
						
						
						
						chore(deps-dev): bump @tauri-apps/cli from 1.3.1 to 1.4.0 
						
						
							
						
					 | 
					
						2023-07-10 21:52:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yifei Zhang
							
						 
					 | 
					
						
						
							
						
						cb29423636
					 | 
					
						
						
							
							Merge pull request #2341 from Yidadaa/dependabot/npm_and_yarn/types/react-18.2.14
						
						
						
						
						
						
						
						chore(deps-dev): bump @types/react from 18.2.12 to 18.2.14 
						
						
							
						
					 | 
					
						2023-07-10 21:51:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yifei Zhang
							
						 
					 | 
					
						
						
							
						
						d754eecf07
					 | 
					
						
						
							
							Merge pull request #2340 from Yidadaa/dependabot/npm_and_yarn/eslint-8.44.0
						
						
						
						
						
						
						
						chore(deps-dev): bump eslint from 8.37.0 to 8.44.0 
						
						
							
						
					 | 
					
						2023-07-10 21:51:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yifei Zhang
							
						 
					 | 
					
						
						
							
						
						1e308782ee
					 | 
					
						
						
							
							Merge pull request #2339 from Yidadaa/dependabot/npm_and_yarn/react-router-dom-6.14.1
						
						
						
						
						
						
						
						chore(deps): bump react-router-dom from 6.10.0 to 6.14.1 
						
						
							
						
					 | 
					
						2023-07-10 21:51:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yifei Zhang
							
						 
					 | 
					
						
						
							
						
						69139cd85b
					 | 
					
						
						
							
							Merge pull request #2344 from imldy/dev_SetInjectSystemPrompts
						
						
						
						
						
						
						
						Dev: 给是否注入全局系统prompt提供一个开关 
						
						
							
						
					 | 
					
						2023-07-10 21:51:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								imldy
							
						 
					 | 
					
						
						
							
						
						f59235bd5a
					 | 
					
						
						
							
							feat: 翻译InjectSystemPrompts配置项为其他语言
						
						
						
						
						
						
							
						
					 | 
					
						2023-07-10 20:14:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								imldy
							
						 
					 | 
					
						
						
							
						
						2930ba0457
					 | 
					
						
						
							
							fix: 修改InjectSystemPrompts.SubTitle使其更符合系统行为
						
						
						
						
						
						
							
						
					 | 
					
						2023-07-10 20:12:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								imldy
							
						 
					 | 
					
						
						
							
						
						1513881eed
					 | 
					
						
						
							
							fix: 修改是否应该注入System Prompt的判断规则为根据设置项
						
						
						
						
						
						
							
						
					 | 
					
						2023-07-10 18:57:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								imldy
							
						 
					 | 
					
						
						
							
						
						5e361f6748
					 | 
					
						
						
							
							dev: 增加模型设置项:是否启用注入全局 System Prompt 功能
						
						
						
						
						
						
							
						
					 | 
					
						2023-07-10 18:56:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dependabot[bot]
							
						 
					 | 
					
						
						
							
						
						b182543a21
					 | 
					
						
						
							
							chore(deps): bump next from 13.4.6 to 13.4.9
						
						
						
						
						
						
						
						Bumps [next](https://github.com/vercel/next.js) from 13.4.6 to 13.4.9.
- [Release notes](https://github.com/vercel/next.js/releases)
- [Changelog](https://github.com/vercel/next.js/blob/canary/release.js)
- [Commits](https://github.com/vercel/next.js/compare/v13.4.6...v13.4.9)
---
updated-dependencies:
- dependency-name: next
  dependency-type: direct:production
  update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com> 
						
						
							
						
					 | 
					
						2023-07-10 10:51:20 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dependabot[bot]
							
						 
					 | 
					
						
						
							
						
						cbce8b444f
					 | 
					
						
						
							
							chore(deps-dev): bump @tauri-apps/cli from 1.3.1 to 1.4.0
						
						
						
						
						
						
						
						Bumps [@tauri-apps/cli](https://github.com/tauri-apps/tauri) from 1.3.1 to 1.4.0.
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](https://github.com/tauri-apps/tauri/compare/cli.js-v1.3.1...@tauri-apps/cli-v1.4.0)
---
updated-dependencies:
- dependency-name: "@tauri-apps/cli"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com> 
						
						
							
						
					 | 
					
						2023-07-10 10:48:41 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dependabot[bot]
							
						 
					 | 
					
						
						
							
						
						38e92cfc62
					 | 
					
						
						
							
							chore(deps-dev): bump @types/react from 18.2.12 to 18.2.14
						
						
						
						
						
						
						
						Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.2.12 to 18.2.14.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react)
---
updated-dependencies:
- dependency-name: "@types/react"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com> 
						
						
							
						
					 | 
					
						2023-07-10 10:47:57 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dependabot[bot]
							
						 
					 | 
					
						
						
							
						
						a7764dc6d5
					 | 
					
						
						
							
							chore(deps-dev): bump eslint from 8.37.0 to 8.44.0
						
						
						
						
						
						
						
						Bumps [eslint](https://github.com/eslint/eslint) from 8.37.0 to 8.44.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.37.0...v8.44.0)
---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com> 
						
						
							
						
					 | 
					
						2023-07-10 10:47:33 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dependabot[bot]
							
						 
					 | 
					
						
						
							
						
						c74552c4c5
					 | 
					
						
						
							
							chore(deps): bump react-router-dom from 6.10.0 to 6.14.1
						
						
						
						
						
						
						
						Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 6.10.0 to 6.14.1.
- [Release notes](https://github.com/remix-run/react-router/releases)
- [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md)
- [Commits](https://github.com/remix-run/react-router/commits/react-router-dom@6.14.1/packages/react-router-dom)
---
updated-dependencies:
- dependency-name: react-router-dom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com> 
						
						
							
						
					 | 
					
						2023-07-10 10:46:56 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yuanliang feng
							
						 
					 | 
					
						
						
							
						
						7a0b437626
					 | 
					
						
						
							
							Update common.ts
						
						
						
						
						
						
							
						
					 | 
					
						2023-07-10 17:26:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yifei Zhang
							
						 
					 | 
					
						
						
							
						
						c7e9f13d2e
					 | 
					
						
						
							
							Update tauri.conf.json
						
						
						
						
						
						
							
 v2.8.9
						
					 | 
					
						2023-07-10 15:03:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yifei Zhang
							
						 
					 | 
					
						
						
							
						
						51e816ad6d
					 | 
					
						
						
							
							Merge pull request #2320 from yanCode/main
						
						
						
						
						
						
						
						fix: typos 
						
						
							
						
					 | 
					
						2023-07-10 14:25:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |