Merge branch 'develop-next' into feature/custom-tix-numbers
Conflicts: include/client/tickets.inc.php include/staff/settings-tickets.inc.php include/upgrader/streams/core/8f99b8bf-00000000.patch.sql scp/css/scp.css setup/inc/streams/core/install-mysql.sql
No related branches found
No related tags found
Showing
- README.md 13 additions, 0 deletionsREADME.md
- WHATSNEW.md 20 additions, 0 deletionsWHATSNEW.md
- account.php 12 additions, 11 deletionsaccount.php
- ajax.php 3 additions, 0 deletionsajax.php
- api/cron.php 1 addition, 1 deletionapi/cron.php
- api/pipe.php 1 addition, 1 deletionapi/pipe.php
- assets/default/about-custom-themes.md 1 addition, 1 deletionassets/default/about-custom-themes.md
- assets/default/css/theme.css 54 additions, 16 deletionsassets/default/css/theme.css
- attachment.php 36 additions, 36 deletionsattachment.php
- bootstrap.php 7 additions, 4 deletionsbootstrap.php
- client.inc.php 10 additions, 1 deletionclient.inc.php
- css/flags.css 258 additions, 0 deletionscss/flags.css
- css/rtl.css 67 additions, 0 deletionscss/rtl.css
- image.php 1 addition, 1 deletionimage.php
- images/flags.png 0 additions, 0 deletionsimages/flags.png
- include/Spyc.php 6 additions, 3 deletionsinclude/Spyc.php
- include/ajax.config.php 26 additions, 0 deletionsinclude/ajax.config.php
- include/ajax.content.php 47 additions, 44 deletionsinclude/ajax.content.php
- include/ajax.draft.php 5 additions, 5 deletionsinclude/ajax.draft.php
- include/ajax.forms.php 8 additions, 4 deletionsinclude/ajax.forms.php
Loading
Please register or sign in to comment