Merge remote branch 'upstream/develop-next' into develop
Conflicts: include/client/header.inc.php
Showing
- .gitignore 4 additions, 0 deletions.gitignore
- README.md 13 additions, 0 deletionsREADME.md
- account.php 12 additions, 11 deletionsaccount.php
- ajax.php 6 additions, 1 deletionajax.php
- api/cron.php 1 addition, 1 deletionapi/cron.php
- api/pipe.php 1 addition, 1 deletionapi/pipe.php
- assets/default/css/theme.css 54 additions, 35 deletionsassets/default/css/theme.css
- attachment.php 36 additions, 36 deletionsattachment.php
- bootstrap.php 10 additions, 6 deletionsbootstrap.php
- client.inc.php 10 additions, 1 deletionclient.inc.php
- css/filedrop.css 191 additions, 0 deletionscss/filedrop.css
- css/flags.css 258 additions, 0 deletionscss/flags.css
- css/osticket.css 3 additions, 0 deletionscss/osticket.css
- css/redactor.css 6 additions, 3 deletionscss/redactor.css
- css/rtl.css 143 additions, 0 deletionscss/rtl.css
- css/thread.css 1 addition, 1 deletioncss/thread.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 25 additions, 6 deletionsinclude/ajax.config.php
Loading
Please register or sign in to comment