Fix more merging issues
Showing
- modules/consent/www/getconsent.php 9 additions, 9 deletionsmodules/consent/www/getconsent.php
- modules/consent/www/noconsent.php 3 additions, 3 deletionsmodules/consent/www/noconsent.php
- modules/core/www/frontpage_auth.php 1 addition, 1 deletionmodules/core/www/frontpage_auth.php
- modules/core/www/frontpage_config.php 1 addition, 1 deletionmodules/core/www/frontpage_config.php
- modules/core/www/frontpage_federation.php 3 additions, 3 deletionsmodules/core/www/frontpage_federation.php
- modules/core/www/frontpage_welcome.php 1 addition, 1 deletionmodules/core/www/frontpage_welcome.php
- modules/core/www/idp/logout-iframe.php 1 addition, 1 deletionmodules/core/www/idp/logout-iframe.php
- modules/core/www/login.php 11 additions, 11 deletionsmodules/core/www/login.php
- modules/core/www/loginuserpass.php 45 additions, 43 deletionsmodules/core/www/loginuserpass.php
- modules/core/www/loginuserpassorg.php 41 additions, 41 deletionsmodules/core/www/loginuserpassorg.php
- modules/core/www/no_cookie.php 3 additions, 3 deletionsmodules/core/www/no_cookie.php
- modules/discopower/lib/PowerIdPDisco.php 14 additions, 14 deletionsmodules/discopower/lib/PowerIdPDisco.php
- modules/multiauth/www/selectsource.php 1 addition, 1 deletionmodules/multiauth/www/selectsource.php
- modules/oauth/lib/Registry.php 2 additions, 2 deletionsmodules/oauth/lib/Registry.php
- templates/includes/header.php 1 addition, 1 deletiontemplates/includes/header.php
- www/index.php 1 addition, 1 deletionwww/index.php
Loading
Please register or sign in to comment