Merge branch 'develop' into 1.x-stable

Edugate · Sep 8, 2014 · e44b1cd · e44b1cd
2 parents 22d2a3b + 8d7d088
commit e44b1cd
Show file tree

Hide file tree

Showing 27 changed files with 0 additions and 13,867 deletions.
diff --git a/theme3/.htaccess b/theme3/.htaccess
diff --git a/theme3/404.html b/theme3/404.html
diff --git a/theme3/apple-touch-icon-114x114-precomposed.png b/theme3/apple-touch-icon-114x114-precomposed.png
diff --git a/theme3/apple-touch-icon-57x57-precomposed.png b/theme3/apple-touch-icon-57x57-precomposed.png
diff --git a/theme3/apple-touch-icon-72x72-precomposed.png b/theme3/apple-touch-icon-72x72-precomposed.png
diff --git a/theme3/apple-touch-icon-precomposed.png b/theme3/apple-touch-icon-precomposed.png
diff --git a/theme3/apple-touch-icon.png b/theme3/apple-touch-icon.png
diff --git a/theme3/config.rb b/theme3/config.rb
diff --git a/theme3/crossdomain.xml b/theme3/crossdomain.xml