Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'release/1.20' into develop

* release/1.20:
  Update changelog
  Bump copyright year to 2013
  Bump version to v1.20
  • Loading branch information...
commit 2a1835b9a2176efd04886f1641a230a3bf419267 2 parents 4e35a7d + adb5005
@canton7 authored
View
2  LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) <2012> by <Antony Male>
+Copyright (C) <2013> by <Antony Male>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
View
4 bootstrap.php
@@ -4,10 +4,10 @@
* Casset: Convenient asset library for FuelPHP.
*
* @package Casset
- * @version v1.19
+ * @version v1.20
* @author Antony Male
* @license MIT License
- * @copyright 2012 Antony Male
+ * @copyright 2013 Antony Male
* @link http://github.com/canton7/fuelphp-casset
*/
View
5 changelog.md
@@ -3,6 +3,11 @@ Changelog
This file lists the important changes between versions. For a list of minor changes, check the log.
+v1.20
+-----
+ - Update addons/readme.md to document more twig functions
+ - Add customisable root path
+
v1.19
-----
- Prevent globs from matching folders
View
4 classes/casset.php
@@ -4,10 +4,10 @@
* Casset: Convenient asset library for FuelPHP.
*
* @package Casset
- * @version v1.19
+ * @version v1.20
* @author Antony Male
* @license MIT License
- * @copyright 2012 Antony Male
+ * @copyright 2013 Antony Male
* @link http://github.com/canton7/fuelphp-casset
*/
View
4 classes/casset/addons/twig.php
@@ -4,11 +4,11 @@
* Casset: Convenient asset library for FuelPHP.
*
* @package Casset
- * @version v1.19
+ * @version v1.20
* @author Antony Male
* @author Derek Myers
* @license MIT License
- * @copyright 2012 Antony Male
+ * @copyright 2013 Antony Male
* @link http://github.com/canton7/fuelphp-casset
*/
View
2  classes/casset/csscompressor.php
@@ -17,7 +17,7 @@
* This library is used as part of Casset.
*
* @package Casset
- * @version v1.19
+ * @version v1.20
* @author Antony Male
* @license MIT License
* @link http://github.com/canton7/fuelphp-casset
View
2  classes/casset/cssurirewriter.php
@@ -10,7 +10,7 @@
* This library is used as part of Casset.
*
* @package Casset
- * @version v1.19
+ * @version v1.20
* @author Antony Male
* @license MIT License
* @link http://github.com/canton7/fuelphp-casset
View
2  classes/casset/cssurirewriterrelative.php
@@ -4,7 +4,7 @@
* This library is used as part of Casset.
*
* @package Casset
- * @version v1.19
+ * @version v1.20
* @author Antony Male
* @license MIT License
* @link http://github.com/canton7/fuelphp-casset
View
2  classes/casset/jsmin.php
@@ -52,7 +52,7 @@
/**
* This library is used as part of Casset.
* @package Casset
- * @version v1.19
+ * @version v1.20
* @author Antony Male
* @license MIT License
* @link http://github.com/canton7/fuelphp-casset
View
4 config/casset.php
@@ -6,7 +6,7 @@
* @version v1.19
* @author Antony Male
* @license MIT License
- * @copyright 2012 Antony Male
+ * @copyright 2013 Antony Male
* @link http://github.com/canton7/fuelphp-casset
*/
@@ -51,7 +51,7 @@
* Absolute path to your Fuel root. If null/falsy, this will default to DOCROOT
*/
'root_path' => null,
-
+
/**
* Asset Sub-folders
*
Please sign in to comment.
Something went wrong with that request. Please try again.