Skip to content

Conversation

@mambax7
Copy link
Collaborator

@mambax7 mambax7 commented Apr 15, 2022

No description provided.

Copy link
Contributor

@ggoffy ggoffy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

everything fine

mambax7 and others added 9 commits May 1, 2023 20:58
…ature/cosmetics_phpdocs

# Conflicts:
#	docs/install.html
#	htdocs/admin.php
#	htdocs/class/libraries/vendor/xoops/xmf/src/Database/Migrate.php
#	htdocs/class/libraries/vendor/xoops/xmf/src/Database/Tables.php
#	htdocs/class/libraries/vendor/xoops/xmf/src/FilterInput.php
#	htdocs/class/libraries/vendor/xoops/xmf/src/Jwt/JsonWebToken.php
#	htdocs/class/libraries/vendor/xoops/xmf/src/Key/Basic.php
#	htdocs/class/libraries/vendor/xoops/xmf/src/Key/KeyAbstract.php
#	htdocs/class/libraries/vendor/xoops/xmf/src/Module/Admin.php
#	htdocs/class/libraries/vendor/xoops/xmf/src/Module/Helper.php
#	htdocs/class/libraries/vendor/xoops/xmf/src/Module/Helper/GenericHelper.php
#	htdocs/class/libraries/vendor/xoops/xmf/src/Module/Helper/Permission.php
#	htdocs/class/libraries/vendor/xoops/xmf/src/Request.php
#	htdocs/class/smarty/configs/index.php
#	htdocs/class/smarty/internals/index.php
#	htdocs/class/smarty/plugins/index.php
#	htdocs/class/smarty/xoops_plugins/compiler.xoAdminIcons.php
#	htdocs/class/smarty/xoops_plugins/compiler.xoAdminNav.php
#	htdocs/class/smarty/xoops_plugins/compiler.xoModuleIcons16.php
#	htdocs/class/smarty/xoops_plugins/compiler.xoModuleIcons32.php
#	htdocs/class/smarty/xoops_plugins/compiler.xoModuleIconsBookmarks.php
#	htdocs/class/smarty/xoops_plugins/function.securityToken.php
#	htdocs/class/smarty/xoops_plugins/function.xoMemberInfo.php
#	htdocs/class/smarty/xoops_plugins/function.xoops_link.php
#	htdocs/class/smarty/xoops_tpl/debug.tpl
#	htdocs/class/textsanitizer/youtube/youtube.php
#	htdocs/footer.php
#	htdocs/include/xoops13_header.php
#	htdocs/lostpass.php
#	htdocs/modules/profile/activate.php
#	htdocs/modules/profile/lostpass.php
#	htdocs/modules/system/admin/comments/main.php
#	htdocs/modules/system/blocks/system_blocks.php
#	htdocs/modules/system/themes/dark/xotpl/xo_footer.tpl
#	htdocs/modules/system/themes/default/xotpl/xo_footer.tpl
#	htdocs/modules/system/themes/thadmin/index.php
#	htdocs/modules/system/themes/thadmin/thadmin.php
#	htdocs/modules/system/themes/transition/xotpl/xo_footer.tpl
#	htdocs/themes/xswatch/README.md
#	htdocs/themes/xswatch/css-dark/index.php
#	htdocs/themes/xswatch/css-light/index.php
#	htdocs/themes/xswatch/css/index.php
#	htdocs/themes/xswatch/fonts/index.php
#	htdocs/themes/xswatch/index.php
#	htdocs/themes/xswatch/js/index.php
#	htdocs/themes/xswatch/js/owl/assets/index.php
#	htdocs/themes/xswatch/js/owl/index.php
#	htdocs/themes/xswatch/language/english/index.php
#	htdocs/themes/xswatch/language/index.php
#	htdocs/themes/xswatch/modules/contact/index.php
#	htdocs/themes/xswatch/modules/extcal/index.php
#	htdocs/themes/xswatch/modules/extgallery/blocks/index.php
#	htdocs/themes/xswatch/modules/extgallery/index.php
#	htdocs/themes/xswatch/modules/index.php
#	htdocs/themes/xswatch/modules/newbb/index.php
#	htdocs/themes/xswatch/modules/news/blocks/index.php
#	htdocs/themes/xswatch/modules/news/index.php
#	htdocs/themes/xswatch/modules/obituaries/index.php
#	htdocs/themes/xswatch/modules/pm/index.php
#	htdocs/themes/xswatch/modules/profile/index.php
#	htdocs/themes/xswatch/modules/publisher/blocks/index.php
#	htdocs/themes/xswatch/modules/publisher/index.php
#	htdocs/themes/xswatch/modules/system/blocks/index.php
#	htdocs/themes/xswatch/modules/system/index.php
#	htdocs/themes/xswatch/modules/tag/index.php
#	htdocs/themes/xswatch/modules/tdmdownloads/blocks/index.php
#	htdocs/themes/xswatch/modules/tdmdownloads/index.php
#	htdocs/themes/xswatch/modules/xoopsfaq/index.php
#	htdocs/themes/xswatch/theme.tpl
#	htdocs/themes/xswatch/tpl/index.php
#	htdocs/themes/xswatch4/modules/xmcontact/blocks/index.php
#	htdocs/themes/xswatch4/modules/xmcontact/index.php
#	htdocs/themes/xswatch4/modules/xmcontent/blocks/index.php
#	htdocs/themes/xswatch4/modules/xmcontent/index.php
#	htdocs/themes/xswatch4/modules/xmdoc/blocks/index.php
#	htdocs/themes/xswatch4/modules/xmdoc/index.php
#	htdocs/themes/xswatch4/modules/xmnews/blocks/index.php
#	htdocs/themes/xswatch4/modules/xmnews/index.php
#	htdocs/themes/xswatch4/modules/xmsocial/index.php
…ature/cosmetics_phpdocs

# Conflicts:
#	htdocs/class/smarty3_plugins/function.xoBlock.php
#	htdocs/class/smarty3_plugins/function.xoUserInfo.php
#	htdocs/class/smarty3_plugins/function.year.php
#	htdocs/class/smarty3_plugins/index.php
#	htdocs/class/smarty3_plugins/modifier.truncateHtml.php
#	htdocs/include/comment_new.php
#	htdocs/include/comment_view.php
#	htdocs/modules/system/admin/users/main.php
#	htdocs/xoops_lib/modules/protector/oninstall.php
…7/XoopsCore25 into feature/cosmetics_phpdocs

# Conflicts:
#	htdocs/modules/system/admin/users/main.php
@mambax7 mambax7 merged commit 7f5510e into XOOPS:master Oct 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants