Merge branch 'beta' into sucs-site
Conflicts: htdocs/images/lastsnap.jpg
No related branches found
No related tags found
Showing
- .gitignore 17 additions, 0 deletions.gitignore
- .gitmodules 3 additions, 0 deletions.gitmodules
- htdocs/css/sucs.css 5 additions, 0 deletionshtdocs/css/sucs.css
- htdocs/doorknock.php 132 additions, 0 deletionshtdocs/doorknock.php
- htdocs/images/lastsnap.jpg 0 additions, 0 deletionshtdocs/images/lastsnap.jpg
- htdocs/js/ckeditor 1 addition, 0 deletionshtdocs/js/ckeditor
- htdocs/js/ckeditor.js 5 additions, 0 deletionshtdocs/js/ckeditor.js
- htdocs/js/jquery-2.1.3.min.js 4 additions, 0 deletionshtdocs/js/jquery-2.1.3.min.js
- lib/banana-admin.php 9 additions, 3 deletionslib/banana-admin.php
- lib/session.php 1 addition, 1 deletionlib/session.php
- plugins/modifier.encodestring.php 8 additions, 0 deletionsplugins/modifier.encodestring.php
- plugins/sucsunreadmail 8 additions, 0 deletionsplugins/sucsunreadmail
- settingstemplate 1 addition, 1 deletionsettingstemplate
- static/Community.txt 2 additions, 2 deletionsstatic/Community.txt
- static/Community/Planet.txt 0 additions, 1 deletionstatic/Community/Planet.txt
- static/Knowledge/FAQ.txt 1 addition, 1 deletionstatic/Knowledge/FAQ.txt
- templates/foot.tpl 12 additions, 0 deletionstemplates/foot.tpl
- templates/head.tpl 0 additions, 4 deletionstemplates/head.tpl
- templates/options.tpl 1 addition, 1 deletiontemplates/options.tpl
- templates/projects.tpl 4 additions, 1 deletiontemplates/projects.tpl
Loading
Please register or sign in to comment