Mercurial > hg > soundsoftware-site
comparison app/controllers/calendars_controller.rb @ 1338:25603efa57b5
Merge from live branch
| author | Chris Cannam |
|---|---|
| date | Thu, 20 Jun 2013 13:14:14 +0100 |
| parents | 433d4f72a19b |
| children | 622f24f53b42 |
comparison
equal
deleted
inserted
replaced
| 1209:1b1138f6f55e | 1338:25603efa57b5 |
|---|---|
| 1 # Redmine - project management software | 1 # Redmine - project management software |
| 2 # Copyright (C) 2006-2011 Jean-Philippe Lang | 2 # Copyright (C) 2006-2012 Jean-Philippe Lang |
| 3 # | 3 # |
| 4 # This program is free software; you can redistribute it and/or | 4 # This program is free software; you can redistribute it and/or |
| 5 # modify it under the terms of the GNU General Public License | 5 # modify it under the terms of the GNU General Public License |
| 6 # as published by the Free Software Foundation; either version 2 | 6 # as published by the Free Software Foundation; either version 2 |
| 7 # of the License, or (at your option) any later version. | 7 # of the License, or (at your option) any later version. |
