View restored after failed merge
modified:   app/main/admin/configuration.lua
Merge pull request #52 from ralzakark/bugfix

View restored after failed merge
Aggiunto routing pulsante assemblea interna m5s.
modified:   app/main/area/filters.lua
modified:   app/main/index/_welcome.lua
Aggiunto routing delle unit sulla homepage
modified:   app/main/index/homepage.lua
Rimosso layout degli slot
modified:   app/main/member/update_position.lua
Merge branch 'test' of https://github.com/Movimento5StelleLazio/ParlamentoElettronicoM5S into develop
Aggiunto routing app/main/unit/show_ext.lua -> app/main/area/_list_ext.lua -> app/main/area/_list_entry_ext -> app/main/area/_head_ext -> app/main/area/filters

new file:   app/main/area/_head_ext.lua
new file:   app/main/area/_list_entry_ext.lua
new file:   app/main/area/_list_ext.lua
modified:   app/main/unit/show_ext.lua
Fixato tab=closed
modified:   app/main/area/filters.lua
Routing addizionale per le viste

modified:   app/main/area/_head_ext.lua
modified:   app/main/area/filters.lua
new file:   app/main/area/show_ext.lua
Merge pull request #53 from ralzakark/bugfix

Routing pagine
Merge pull request #54 from ralzakark/develop

Routing pagine 2
Corretto routing back button verso index page per assemblea iscritti
modified:   app/main/unit/show_ext.lua
	modified:   app/main/area/filters.lua
	modified:   app/main/area/show_ext.lua
	modified:   app/main/unit/show_ext.lua
	modified:   extras/myconfig.lua
	modified:   locale/translations.it.lua
	modified:   static/m5s.css
modified:   app/main/area/show_ext.lua
modified:   app/main/area/show_ext.lua
modified:   locale/translations.it.lua
	modified:   app/main/_layout/default.html
	modified:   static/m5s.css
modified:   app/main/area/show_ext.lua
modified:   locale/translations.it.lua
modified:   app/main/area/filters.lua
modified:   app/main/area/show_ext.lua
	new file:   static/__BACKUP_ORIGINALEm5s.css
	modified:   static/m5s.css