diff options
author | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
---|---|---|
committer | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
commit | 45a854762b451dafb882bc56efce054b64420627 (patch) | |
tree | 958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /library/moment/LICENSE | |
parent | 1806da0851dd5cf5978b19d12783ae3101a11257 (diff) | |
parent | a29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff) | |
download | volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2 volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip |
Resolved conflict in view/it/hstrings.php
Diffstat (limited to 'library/moment/LICENSE')
-rw-r--r-- | library/moment/LICENSE | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/moment/LICENSE b/library/moment/LICENSE index 34f5b3707..9ee537448 100644 --- a/library/moment/LICENSE +++ b/library/moment/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2011-2015 Tim Wood, Iskren Chernev, Moment.js contributors +Copyright (c) 2011-2016 Tim Wood, Iskren Chernev, Moment.js contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation |