Commit e516326e authored by Imran Hussain's avatar Imran Hussain

Merge branch 'master' into 'master'

ckeditor is now included as a submodule

Added ckeditor stable as a submodule to htdocs/js/ckeditor
Added a gitignore so that the files generated by the setup script don't get added to the repo in future.
Also included the the cached template folder 'template_c' so that doesn't get included either

 Changes to be committed:
* new file:   .gitignore
* new file:   .gitmodules
* new file:   htdocs/js/ckeditor

See merge request !3
parents a4206f63 657d2b85
# Some of the files that are generated by the setup script don't want to be version controlled.
# To that end I have added this .gitignore file to ignore the following files and folders
# This is the generated .htaccess
htdocs/.htaccess
# Generated settings.php file
settings.php
# Compiled templates_c
templates_c/
[submodule "htdocs/js/ckeditor"]
path = htdocs/js/ckeditor
url = git://github.com/ckeditor/ckeditor-releases.git
Subproject commit a93cb51eb1fc85a13892706dd61eccfd4c999947
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment