# Wrong patch applied for [28214]. Thanks Tristan Bellosa
 # [#32177] *Notice at login when session expires Thanks Elin Waring
 # com_templates and codemirror problem. Thanks Achal Aggarwal
(Fix #2139)
Merge branch 'master' of github.com:joomla/joomla-cms