Ondřej Hruška 
							
						 
					 
					
						
						
							
						
						7a1ca8b0df 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						 
						
						
						
						
					 
					
						2017-08-07 22:43:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sorin Davidoi 
							
						 
					 
					
						
						
							
						
						8eb6d171e6 
					 
					
						
						
							
							feat: Cache status height to avoid expensive renders ( #4439 )  
						
						 
						
						... 
						
						
						
						* feat: Cache status height to avoid expensive renders
* feat: Escape content and emojify in reducers
* fix(css): Remove backface-visibility: hidden from .scrollable
* fix(statuses): Avoid creating DOMParses inside a loop 
						
						
					 
					
						2017-08-07 20:32:03 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ondřej Hruška 
							
						 
					 
					
						
						
							
						
						5942347407 
					 
					
						
						
							
							Refactor Avatar and AvatarOverlay to have 'account' as prop instead of src and staticSrc ( #4526 )  
						
						 
						
						... 
						
						
						
						* Refactored Avatar and AvatarOverlay (DRY) to have 'account' as prop.
Also removed animate attribute from compose navigation bar, which should
have never been there. Added test for avatar overlay.
* fix broken tests
* god dammit another bug in tests! travis please let this pass
* formatting in avatar overlay 
						
						
					 
					
						2017-08-07 19:44:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Masoud Abkenar 
							
						 
					 
					
						
						
							
						
						e7a5a188ef 
					 
					
						
						
							
							i18n: update Persian translation ( #4540 )  
						
						 
						
						
						
						
					 
					
						2017-08-06 23:50:20 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ondřej Hruška 
							
						 
					 
					
						
						
							
						
						91836d577e 
					 
					
						
						
							
							Add data-avatar-of="@..." to all user avatars  
						
						 
						
						
						
						
					 
					
						2017-08-06 21:24:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ondřej Hruška 
							
						 
					 
					
						
						
							
						
						811d895f7b 
					 
					
						
						
							
							Merged upstream PR  #4526  
						
						 
						
						
						
						
					 
					
						2017-08-06 21:23:36 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MitarashiDango 
							
						 
					 
					
						
						
							
						
						5ee45fa571 
					 
					
						
						
							
							fix columns_area.js ( #4528 )  
						
						 
						
						
						
						
					 
					
						2017-08-05 20:33:41 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Akihiko Odaki 
							
						 
					 
					
						
						
							
						
						9d1f8b9d6a 
					 
					
						
						
							
							Scroll columns area to right when children property is changed ( #4517 )  
						
						 
						
						... 
						
						
						
						The feature to pin column could hide the rightmost column, which is
specified with children property of ColumnsArea.
The user is likely to see the column when the property changed, so scroll
the area in such cases. 
						
						
					 
					
						2017-08-04 18:57:46 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Krzysztof Jurewicz 
							
						 
					 
					
						
						
							
						
						400616813e 
					 
					
						
						
							
							Fix some mistakes in Polish translation ( #4495 )  
						
						 
						
						
						
						
					 
					
						2017-08-04 22:43:28 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MIYAGI Hikaru 
							
						 
					 
					
						
						
							
						
						09e86ef90b 
					 
					
						
						
							
							make number of comparison in emojify() fewer ( #4500 )  
						
						 
						
						... 
						
						
						
						fix style
"©"削除処理をemojione_lightに移動 
						
						
					 
					
						2017-08-02 21:05:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sorin Davidoi 
							
						 
					 
					
						
						
							
						
						ac53736814 
					 
					
						
						
							
							fix(status_list): Use correct keys for keyboard navigation ( #4487 )  
						
						 
						
						
						
						
					 
					
						2017-08-02 13:09:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Komic 
							
						 
					 
					
						
						
							
						
						8c0e78ae43 
					 
					
						
						
							
							fr.json update ( #4492 )  
						
						 
						
						
						
						
					 
					
						2017-08-02 13:31:49 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kibigo! 
							
						 
					 
					
						
						
							
						
						8b58153583 
					 
					
						
						
							
							Fixed onClick column links  
						
						 
						
						
						
						
					 
					
						2017-08-01 13:46:52 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kibigo! 
							
						 
					 
					
						
						
							
						
						8150689b48 
					 
					
						
						
							
							Merge upstream ( #111 )  
						
						 
						
						
						
						
					 
					
						2017-08-01 13:20:29 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quent-in 
							
						 
					 
					
						
						
							
						
						7ef8482568 
					 
					
						
						
							
							l10n  #4457  update for Occitan language ( #4483 )  
						
						 
						
						... 
						
						
						
						Previous and Next buttons 
						
						
					 
					
						2017-08-02 00:12:30 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeroen 
							
						 
					 
					
						
						
							
						
						202942a76f 
					 
					
						
						
							
							Update Dutch (nl) strings ( #4480 )  
						
						 
						
						
						
						
					 
					
						2017-08-01 15:00:41 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sorin Davidoi 
							
						 
					 
					
						
						
							
						
						d4c4820c03 
					 
					
						
						
							
							fix(web_push_notifications): Send message with welcome notifications ( #4471 )  
						
						 
						
						... 
						
						
						
						* fix(web_push_notifications): Send grouping title in welcome notification
* fix(web_push_notifications): Read message from last notification 
						
						
					 
					
						2017-08-01 06:00:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ondřej Hruška 
							
						 
					 
					
						
						
							
						
						e9ee249fd5 
					 
					
						
						
							
							do not emojify tm, (R) and (C) ( #4472 )  
						
						 
						
						
						
						
					 
					
						2017-08-01 00:16:05 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Masoud Abkenar 
							
						 
					 
					
						
						
							
						
						4b6cd1dfdb 
					 
					
						
						
							
							i18n: update Persian translation ( #4470 )  
						
						 
						
						... 
						
						
						
						* i18n: update Persian translation
* i18n: fix quotes 
						
						
					 
					
						2017-07-31 19:40:57 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
							
						
						b9ec3b7e7c 
					 
					
						
						
							
							Load extra polyfills when isIntersecting is undefined ( #4469 )  
						
						 
						
						
						
						
					 
					
						2017-07-31 19:40:20 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						c7cc806251 
					 
					
						
						
							
							Simplify web UI character counter logic ( #4463 )  
						
						 
						
						
						
						
					 
					
						2017-07-31 15:19:48 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								m4sk1n 
							
						 
					 
					
						
						
							
						
						93aafa8549 
					 
					
						
						
							
							i18n: Update Polish translation ( #4467 )  
						
						 
						
						
						
						
					 
					
						2017-07-31 19:40:25 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
							
						
						bb85043f46 
					 
					
						
						
							
							Disable sensitive button when with content warnings ( #4460 )  
						
						 
						
						
						
						
					 
					
						2017-07-31 05:06:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sorin Davidoi 
							
						 
					 
					
						
						
							
						
						e44f03bc71 
					 
					
						
						
							
							Improve accessibility (part 7) ( #4457 )  
						
						 
						
						... 
						
						
						
						* fix(media_modal): Keyboard navigation
* fix(column_back_button): Use native button
* fix(media_gallery): Keyboard navigation
* fix(status_content): Make CW content focusable 
						
						
					 
					
						2017-07-31 00:18:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ondřej Hruška 
							
						 
					 
					
						
						
							
						
						6ff084dbbb 
					 
					
						
						
							
							Improved notifications cleaning UI with set operations ( #109 )  
						
						 
						
						... 
						
						
						
						* added notification cleaning drawer
* bugfix
* fully implemented set operations for notif cleaning
* i18n for notif cleaning drawer & improved logic slightly. Also added a confirm dialog
* - notif dismiss "overlay" now shoves the notif aside to avoid overlap
- added focus ring to header buttons
- removed notif overlay entirely from DOM if mode is disabled
* removed comment
* CSS tuning - inconsistent division lines fix 
						
						
					 
					
						2017-07-30 12:36:28 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
							
						
						970297a138 
					 
					
						
						
							
							Change to sensitive when adding content warning from web UI ( #4456 )  
						
						 
						
						
						
						
					 
					
						2017-07-30 16:27:57 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								unarist 
							
						 
					 
					
						
						
							
						
						feadf7553d 
					 
					
						
						
							
							Update Japanese translations ( #4453 )  
						
						 
						
						
						
						
					 
					
						2017-07-30 14:14:41 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sorin Davidoi 
							
						 
					 
					
						
						
							
						
						4f04981dde 
					 
					
						
						
							
							feat(tabs_bar): Avoid optimization for non-touch devices ( #4444 )  
						
						 
						
						... 
						
						
						
						* fix(tabs_bar): Check if transition is necessary
* feat(tabs_bar): Only apply optimization for touch devices 
						
						
					 
					
						2017-07-29 21:20:34 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeroen 
							
						 
					 
					
						
						
							
						
						0913351dcf 
					 
					
						
						
							
							Dutch: only one (new) string ( #4440 )  
						
						 
						
						
						
						
					 
					
						2017-07-29 23:54:27 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								unarist 
							
						 
					 
					
						
						
							
						
						a5e0cf2450 
					 
					
						
						
							
							fix(status): Don't add tabIndex to wrapped status ( #4437 )  
						
						 
						
						
						
						
					 
					
						2017-07-29 14:20:05 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								みたらしだんご 
							
						 
					 
					
						
						
							
						
						a46ba4a8f5 
					 
					
						
						
							
							fix tabs_bar.js ( #4436 )  
						
						 
						
						
						
						
					 
					
						2017-07-29 14:19:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sorin Davidoi 
							
						 
					 
					
						
						
							
						
						c71874b84c 
					 
					
						
						
							
							Improve accessibility (part 6) ( #4435 )  
						
						 
						
						... 
						
						
						
						* fix(status_action_bar): Use aria-pressed for reblog and favourite button
* fix(column_back_button): Keyboard accessible
* fix(status_content): Make focusable and accessible
* fix(dropdown_menu): Use aria-expanded instead of aria-pressed
* fix(emoji_picker_dropdown): Use aria-expanded instead of aria-hidden
* feat(icon_button): Add aria-expanded
* fix(privacy_dropdown): Use aria-expanded instead of aria-hidden 
						
						
					 
					
						2017-07-29 01:58:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						53b2b1b238 
					 
					
						
						
							
							Count all URLs in text as 23 characters flat, do not count domain part of usernames ( #4427 )  
						
						 
						
						... 
						
						
						
						* Count all URLs in text as 23 characters flat, do not count domain part of usernames
* Add new status text counting logic to web UI 
						
						
					 
					
						2017-07-29 00:06:29 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sorin Davidoi 
							
						 
					 
					
						
						
							
						
						634b71ed1d 
					 
					
						
						
							
							Accessability fixes ( #4432 )  
						
						 
						
						... 
						
						
						
						* fix(modal_root): Read type from props, not from component
* fix(status_list): Do not user event.path 
						
						
					 
					
						2017-07-28 22:55:19 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sorin Davidoi 
							
						 
					 
					
						
						
							
						
						3d378ed0b4 
					 
					
						
						
							
							fix(tabs_bar): Allow animation to end before navigating ( #4429 )  
						
						 
						
						... 
						
						
						
						* fix(tabs_bar): Allow animation to end before navigating
* fix(tabs_bar): Do not use event.path 
						
						
					 
					
						2017-07-28 22:55:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quent-in 
							
						 
					 
					
						
						
							
						
						ff9d344d4c 
					 
					
						
						
							
							i18n update of OC version ( #4425 )  
						
						 
						
						... 
						
						
						
						* Correction of misspellings
* Improve the OC version
* Improve of the OC version
* Improvement of OC version 
						
						
					 
					
						2017-07-29 00:09:38 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
							
						
						12874eafa6 
					 
					
						
						
							
							Unify webpackChunkName to lowercase ( #4412 )  
						
						 
						
						
						
						
					 
					
						2017-07-28 13:34:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sorin Davidoi 
							
						 
					 
					
						
						
							
						
						534da4f24f 
					 
					
						
						
							
							Improve accessibility (part 5) ( #4417 )  
						
						 
						
						... 
						
						
						
						* fix(status): Add tabIndex=0
* fix(status_list): Make keyboard navigable 
						
						
					 
					
						2017-07-28 13:33:40 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
							
						
						58eea59864 
					 
					
						
						
							
							Fix broken PropTypes ( #4413 )  
						
						 
						
						
						
						
					 
					
						2017-07-28 13:32:05 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								m4sk1n 
							
						 
					 
					
						
						
							
						
						c7de92e0df 
					 
					
						
						
							
							i18n: Update Polish translation ( #4414 )  
						
						 
						
						... 
						
						
						
						Signed-off-by: Marcin Mikołajczak <me@m4sk.in > 
						
						
					 
					
						2017-07-28 17:53:44 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sorin Davidoi 
							
						 
					 
					
						
						
							
						
						e67fc997dc 
					 
					
						
						
							
							feat(web_push_notifications): Group notifications ( #4388 )  
						
						 
						
						
						
						
					 
					
						2017-07-28 05:06:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sorin Davidoi 
							
						 
					 
					
						
						
							
						
						3e01a7e677 
					 
					
						
						
							
							fix(web_push_notification): Do not hard reload tab ( #4380 )  
						
						 
						
						... 
						
						
						
						* fix(web_push_notification): Do not hard reload tab
* fix(web_push_notification_worker): Guard against null subscription
* refactor: Incorporate pull request feedback 
						
						
					 
					
						2017-07-28 05:06:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sorin Davidoi 
							
						 
					 
					
						
						
							
						
						b7d47c2aef 
					 
					
						
						
							
							Improve accessibility (part 4) ( #4408 )  
						
						 
						
						... 
						
						
						
						* fix(dropdown_menu): Keyboard navigation
* fix(icon_button): Add aria-pressed attribute
* fix(privacy_dropdown): Make accessible
* fix(emoji_picker_dropdown): Make accessible
* fix(icon_button): Support tabIndex
* fix(actions_modal): Remove icon from tab order
* fix(dropdown_menu): Add role=group
* fix(setting_toggle): Toggle via space key
* fix(dropdown_menu): Remove redundant handling of Space key
* fix(emoji_picker_dropdown): Remove redundant Space key handling
* fix(privacy_dropdown): Remove redundant Space key handling
* fix(status): Switch to article and add aria-posinset, aria-setsize
* fix(status_list): Use role=feed and pass more ARIA props to Status
* chore(eslint): jsx-a11y/role-supports-aria-props 
						
						
					 
					
						2017-07-28 04:37:30 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sorin Davidoi 
							
						 
					 
					
						
						
							
						
						9004151e34 
					 
					
						
						
							
							feat: Web Share for detailed status and account ( #4402 )  
						
						 
						
						... 
						
						
						
						* feat: Web Share for detailed status and account
* fix(account/action_bar): Move share under mention 
						
						
					 
					
						2017-07-28 00:55:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sorin Davidoi 
							
						 
					 
					
						
						
							
						
						6884dd79ba 
					 
					
						
						
							
							Improve accessibility (part 3) ( #4405 )  
						
						 
						
						... 
						
						
						
						* fix(compose): Add aria-label for the navigation links
* fix(search): Add input label
* fix(navigation_bar): Link description
* fix(autosuggest_textarea): Add input label
* fix(compose_form): Add input label
* fix(upload_button): Add input label
* fix(account/header): Add link content
* fix(column_header): Use h1 tag
* fix(column_header): Labels move buttons moving column
* fix(settings_text): Add label to input
* fix(column_header): Remove role from h1
* fix(modal_root): Use role=dialog
* fix(modal_root): Focus restauration
* fix(modal_root): Apply inert to sibligs
* fix(column_header): Add role=button
* chore(eslint): Disable jsx-a11y/label-has-for 
						
						
					 
					
						2017-07-28 00:54:48 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sorin Davidoi 
							
						 
					 
					
						
						
							
						
						f9075577e4 
					 
					
						
						
							
							fix(actions_modal): Warning about missing prop ( #4406 )  
						
						 
						
						
						
						
					 
					
						2017-07-27 23:01:50 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sorin Davidoi 
							
						 
					 
					
						
						
							
						
						50d38d7605 
					 
					
						
						
							
							fix(dropdown_menu): Open as modal on mobile ( #4295 )  
						
						 
						
						... 
						
						
						
						* fix(dropdown_menu): Open as modal on mobile
* fix(dropdown_menu): Open modal on touch
* fix(dropdown_menu): Show status
* fix(dropdown_menu): Max dimensions and reduce padding
* chore(dropdown_menu): Test new functionality
* refactor: Use DropdownMenuContainer instead of DropdownMenu
* feat(privacy_dropdown): Open as modal on touch devices
* feat(modal_root): Do not load actions-modal async 
						
						
					 
					
						2017-07-27 22:31:59 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
							
						
						f2233c3e25 
					 
					
						
						
							
							Update intersection-observer to version 0.4.0 ( #4398 )  
						
						 
						
						
						
						
					 
					
						2017-07-27 16:20:48 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ondřej Hruška 
							
						 
					 
					
						
						
							
						
						cb69e35b3b 
					 
					
						
						
							
							Add visibility icon to Detailed status  
						
						 
						
						
						
						
					 
					
						2017-07-27 00:41:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeroen 
							
						 
					 
					
						
						
							
						
						f5e228ad2e 
					 
					
						
						
							
							Update Dutch strings ( #4389 )  
						
						 
						
						
						
						
					 
					
						2017-07-27 00:37:35 +02:00