Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							b798c48040 
							
						 
					 
					
						
						
							
							bump version to 1.11  
						
						
						
					 
					
						2018-09-30 20:07:45 -10:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							8c18bada0c 
							
						 
					 
					
						
						
							
							lib, cli, ui, web: update cabal files  
						
						
						
					 
					
						2018-09-22 21:01:23 -10:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							362705a981 
							
						 
					 
					
						
						
							
							update cabal files  
						
						
						
					 
					
						2018-09-07 12:44:52 -07:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							23bdac41d9 
							
						 
					 
					
						
						
							
							csv: merge lucamolteni's cassava/custom separators (squashed) ( #829 )  
						
						... 
						
						
						
						commit 5ba464de761b298e50d57a8b7d14bc28adb30d5d
Author: Luca Molteni <volothamp@gmail.com>
Date:   Fri Sep 7 17:54:12 2018 +0200
    Fix CI 2
commit f060ae9449f4b61a915b0ed4629fc1ba9b66fb4a
Author: Luca Molteni <volothamp@gmail.com>
Date:   Fri Sep 7 17:30:08 2018 +0200
    Fix CI build
commit af0719a33b9b72ad244ae80198d881a1f7145e9d
Author: Luca Molteni <volothamp@gmail.com>
Date:   Fri Sep 7 17:19:01 2018 +0200
    Fix rebase
commit 1a24ddfa54dfb4ff1326e1a51005ffa82d3dc3c8
Author: Luca Molteni <volothamp@gmail.com>
Date:   Fri Aug 10 16:25:24 2018 +0200
    Fixed some GHC warnings
commit 1ac43398a359b5925ef71f53347698f1c6c510ef
Author: Luca Molteni <volothamp@gmail.com>
Date:   Fri Aug 10 16:14:49 2018 +0200
    Fix .cabal
commit 422456b925d8aa4ab3e869f51e98c2b1c3dcde0a
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sun Jul 1 22:56:20 2018 +0200
    Removed to-do list
commit 1118b762e4fd15c4fe7ba48ba86676706ea3a5a5
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sun Jul 1 22:53:28 2018 +0200
    Better test
commit 1146ed0941655668bf7684f18aa15c5f4b9b20c2
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sun Jul 1 15:32:28 2018 +0200
    Fix parsing
commit 4fc2374b2b81802990da30c96756aab54d77399c
Author: Luca Molteni <volothamp@gmail.com>
Date:   Thu Jun 21 22:11:11 2018 +0200
    Parsing of separator
commit f7a61737f1ad4460ba20ca9b2e86eb21468abb33
Author: Luca Molteni <volothamp@gmail.com>
Date:   Thu Jun 21 14:29:23 2018 +0200
    Almost separator in options
commit ac8841cf3b9c80914bc3271ad9b9ff4ae9ba48a7
Author: Luca Molteni <volothamp@gmail.com>
Date:   Thu Jun 21 14:16:59 2018 +0200
    Separator in parseCSV
commit 92a8b9f6ba77ea4237f769641e03029ac88542ea
Author: Luca Molteni <volothamp@gmail.com>
Date:   Thu Jun 21 13:30:41 2018 +0200
    separator option
commit ec417a81ae625647cf35e61776cdf02bdb2c6aea
Author: Luca Molteni <volothamp@gmail.com>
Date:   Thu Jun 21 10:45:26 2018 +0200
    Removed one qualified import
commit 8b2f386c2f780adcd34cff3de7edceacc1d325a7
Author: Luca Molteni <volothamp@gmail.com>
Date:   Wed Jun 20 14:01:12 2018 +0200
    Removed string conversions
commit a14d0e099e28a286bb81770cfc9cb8f5c7e5cf1f
Author: Luca Molteni <volothamp@gmail.com>
Date:   Wed Jun 20 10:23:20 2018 +0200
    custom delimiter in cassava
commit 694d48e2bc1ada0037b90367c017f3082f68ed45
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sun Jun 10 17:51:54 2018 +0200
    Use Text.getContents - remove UTF-8 compatibility library
commit a7ada2cc60033ebdd796ca34cc2ec69a4f387843
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sun Jun 10 17:49:34 2018 +0200
    todo list
commit 58ec47d3987909f6bace50e3e647e30dadd5bf03
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sun Jun 10 17:45:22 2018 +0200
    CSV test now has unicode characters
commit b7851e94c3f1683b63ec7250a12bcde3b7bed691
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sun Jun 10 16:59:39 2018 +0200
    Use decode from Text
commit 79f59fd28ccaca08fcd718fcd8d00b1c1d65d7e1
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sun Jun 10 13:28:57 2018 +0200
    Use Text and Lazy Bytestring
commit 470c9bcb8dc00669beb4ef0303a1e7d9f7aecc89
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sat Jun 9 15:30:22 2018 +0200
    Use megaparsec error
commit f978848ba249ef4f67b855bea5d4e549290c205c
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sat Jun 9 15:22:07 2018 +0200
    Renamed qualify and remove Parsec
commit 152587fde204c43a55798d212e43f37cd3038c2e
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sat Jun 9 15:12:36 2018 +0200
    Use cassava mega parsec
commit cf281577a3d3a071196484a6fc8485f2ea1f7d67
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sat Jun 9 14:01:47 2018 +0200
    Removed Data.Vector
commit 1272e8e758369d8cc5778029a705b277355a5029
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sat Jun 9 12:16:18 2018 +0200
    Removed Parsec ParseError
commit ae07f043135a19307fd65b281ade37a74c76acb2
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sat Jun 9 12:06:14 2018 +0200
    Type sinonim for ParsecError
commit 8e15b253c11bd1c0c35a7641aeb18aa54e0ba9b0
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sat Jun 9 11:16:08 2018 +0200
    Replaced with typeclasses
commit 1ed46f9c175603611325f3d377004e4b85f29377
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sat Jun 9 11:01:33 2018 +0200
    Replaced Text/CSV with Cassava
commit 362f4111b5854145703174b976fc7acbd71b8783
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sat Jun 9 10:34:37 2018 +0200
    Use cassava parsin instead of Text/CSV
commit 83e678e371618687cf7c15a4e2cfa67f570b6b64
Author: Luca Molteni <volothamp@gmail.com>
Date:   Sat Jun 9 08:22:51 2018 +0200
    Text CSV error messages
commit f922df71d274beeacab9fb2530b16c97f005cc08
Author: Luca Molteni <volothamp@gmail.com>
Date:   Fri Jun 8 21:45:20 2018 +0200
    Better types
commit edd130781c84790a53bff2283e6041eb8232e7cf
Author: Luca Molteni <volothamp@gmail.com>
Date:   Fri Jun 8 21:34:59 2018 +0200
    Conversion to Text CSV type
commit 0799383214483018ad2d977a3c8022414959c2b2
Author: Luca Molteni <volothamp@gmail.com>
Date:   Fri Jun 8 16:06:21 2018 +0200
    First function with cassava
commit e92aeb151ff527b383ff3d0ced7764e81b71af82
Author: Luca Molteni <volothamp@gmail.com>
Date:   Fri Jun 8 13:47:34 2018 +0200
    Added cassava as dependency
commit 5ea005c558a3939af7e5f0cd735a9b4da931228e
Author: Luca Molteni <volothamp@gmail.com>
Date:   Fri Jun 8 13:18:47 2018 +0200
    Better .gitignore for multi idea modules 
						
					 
					
						2018-09-07 12:34:51 -07:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							d893ed64a5 
							
						 
					 
					
						
						
							
							lib: drop hunittests test suite & HUnit dependency  
						
						
						
					 
					
						2018-09-04 13:53:59 -07:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							582e088325 
							
						 
					 
					
						
						
							
							lib: tests/ -> test/  
						
						
						
					 
					
						2018-08-18 15:20:15 +01:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							dab75d98c8 
							
						 
					 
					
						
						
							
							lib: expectEq', expectParseEq: pretty-print compared values ( #812 )  
						
						
						
					 
					
						2018-08-16 06:31:37 +01:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							50d666d5a0 
							
						 
					 
					
						
						
							
							test: refactor, document, organise easytests, port amountp tests ( #812 )  
						
						
						
					 
					
						2018-08-15 19:58:07 +01:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							72acb86299 
							
						 
					 
					
						
						
							
							cabal: bump tested-with declarations  
						
						
						
					 
					
						2018-08-02 08:25:49 +01:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							a49b1cd3bb 
							
						 
					 
					
						
						
							
							lib: AutoTransaction.hs -> TransactionModifier.hs, PeriodicTransaction.hs  
						
						
						
					 
					
						2018-07-30 20:22:39 +01:00 
						 
				 
			
				
					
						
							
							
								Joseph Weston 
							
						 
					 
					
						
						
						
						
							
						
						
							2d420a33a4 
							
						 
					 
					
						
						
							
							lib: update cabal file with 'Glob' library depdendency  
						
						
						
					 
					
						2018-07-26 06:12:31 +01:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							d62f082bce 
							
						 
					 
					
						
						
							
							bump version to 1.10.99 (dev)  
						
						
						
					 
					
						2018-07-04 13:32:42 +01:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							6242b1d784 
							
						 
					 
					
						
						
							
							bump version to 1.10  
						
						
						
					 
					
						2018-06-30 22:08:02 +01:00 
						 
				 
			
				
					
						
							
							
								Alex Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							0382bb5cd4 
							
						 
					 
					
						
						
							
							lib: move custom parse errors to Text.Megaparsec.Custom  
						
						
						
					 
					
						2018-06-11 13:58:56 -06:00 
						 
				 
			
				
					
						
							
							
								Alex Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							39e7ef0311 
							
						 
					 
					
						
						
							
							lib: refine date parser error messages  
						
						
						
					 
					
						2018-06-11 13:58:55 -06:00 
						 
				 
			
				
					
						
							
							
								Alex Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							ca201e4618 
							
						 
					 
					
						
						
							
							lib: add a module for custom parse errors  
						
						... 
						
						
						
						... for displaying the source line on which parse errors occured
Over the following set of commits, I will to refactor the parsers to
obviate the `ExceptT String` layer of the `ErroringJournalParser` type
so that all parse errors go through Megaparsec's parse error machinery. 
						
					 
					
						2018-06-11 13:57:22 -06:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							7ebecb1ab8 
							
						 
					 
					
						
						
							
							use newer hashtables to fix an instance warning with doctests/ghc 7 ( #794 )  
						
						
						
					 
					
						2018-06-04 17:33:17 -07:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							0ce9c5728a 
							
						 
					 
					
						
						
							
							switch to base-compat-batteries to fix ghc 7.10 support ( #794 )  
						
						... 
						
						
						
						base-compat-batteries provides the same API across more ghc versions
than base-compat does, at the cost of more dependencies. Eg it exports
Prelude.Compat ((<>)) with ghc 7.10/base 4.8, which we expect.
My belief is that several of our deps already require it so the added
cost is not too great. We should probably go back to base-compat when
possible though, eg when we stop supporting ghc 7.10. 
						
					 
					
						2018-06-04 17:32:42 -07:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							328b2dabfe 
							
						 
					 
					
						
						
							
							require latest base-compat, might as well ( #794 )  
						
						
						
					 
					
						2018-06-04 17:32:32 -07:00 
						 
				 
			
				
					
						
							
							
								Peter Simons 
							
						 
					 
					
						
						
						
						
							
						
						
							8c0c168cd6 
							
						 
					 
					
						
						
							
							Fix the build of hledger-lib with ghc 8.0.x and base-compat 0.10.x.  
						
						... 
						
						
						
						We don't need to import Data.Monoid because Prelude.Compat exports "<>"
already. In fact, importing that module causes build failures:
    Hledger/Read/Common.hs:725:62: error:
        Ambiguous occurrence ‘<>’
        It could refer to either ‘Sem.<>’,
                                 imported from ‘Prelude.Compat’ at Hledger/Read/Common.hs:97:1-39
                                 (and originally defined in ‘Data.Semigroup’)
                              or ‘Data.Monoid.<>’,
                                 imported from ‘Data.Monoid’ at Hledger/Read/Common.hs:110:1-18
Fixes https://github.com/simonmichael/hledger/issues/794 . 
						
					 
					
						2018-06-04 20:58:58 +02:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							66fbdc5d61 
							
						 
					 
					
						
						
							
							lib: enable doctests on mac again, note workaround, fix link  
						
						... 
						
						
						
						[ci skip] 
						
					 
					
						2018-06-01 07:18:12 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							b245ec7b3d 
							
						 
					 
					
						
						
							
							lib: remove the megaparsec compatability module  
						
						
						
					 
					
						2018-05-22 12:16:46 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							c4ba7542d7 
							
						 
					 
					
						
						
							
							lib: use megaparsec 6 for all supported ghc versions  
						
						
						
					 
					
						2018-05-22 12:16:46 -07:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							c9d46f830f 
							
						 
					 
					
						
						
							
							lib: fix hpack warning  
						
						... 
						
						
						
						[ci skip] 
						
					 
					
						2018-05-14 10:28:29 -07:00 
						 
				 
			
				
					
						
							
							
								Mykola Orliuk 
							
						 
					 
					
						
						
						
						
							
						
						
							64c7eb78f4 
							
						 
					 
					
						
						
							
							GHC 8.0 compatibility  
						
						
						
					 
					
						2018-05-13 14:41:08 -07:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							41665d07b0 
							
						 
					 
					
						
						
							
							regenerate cabal files, fix tabular compilation error  
						
						
						
					 
					
						2018-04-23 18:52:28 -07:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							43287a3e26 
							
						 
					 
					
						
						
							
							budget: use a new first-class BudgetReport for --budget  
						
						
						
					 
					
						2018-04-23 18:52:28 -07:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							4b3c6afe75 
							
						 
					 
					
						
						
							
							lib: new generic PeriodicReport, and some report-related type aliases  
						
						
						
					 
					
						2018-04-23 18:52:28 -07:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							d53557b09d 
							
						 
					 
					
						
						
							
							regen cabal files with stack 1.7's hpack (0.28.2)  
						
						
						
					 
					
						2018-04-20 06:47:52 -07:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							30186e35ea 
							
						 
					 
					
						
						
							
							cabal: update tested-with  
						
						
						
					 
					
						2018-04-20 05:24:09 -07:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							7129577f34 
							
						 
					 
					
						
						
							
							update cabal files  
						
						
						
					 
					
						2018-04-04 17:56:22 +01:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							4ea02bf1cb 
							
						 
					 
					
						
						
							
							bump version to 1.9.99  
						
						
						
					 
					
						2018-04-04 17:53:38 +01:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							6ebb1fb061 
							
						 
					 
					
						
						
							
							update cabal files  
						
						
						
					 
					
						2018-03-31 19:15:24 +01:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							0979dbc01f 
							
						 
					 
					
						
						
							
							regenerate cabal files with stack 1.6.3 to silence hpack warnings  
						
						... 
						
						
						
						[ci skip] 
						
					 
					
						2018-03-31 03:24:01 +01:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							d403b003c1 
							
						 
					 
					
						
						
							
							lib: disable doctests when building with ghc 8.4 on mac  
						
						... 
						
						
						
						[ci skip] 
						
					 
					
						2018-03-26 18:23:46 +01:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							21db75f1a6 
							
						 
					 
					
						
						
							
							update cabal files  
						
						
						
					 
					
						2018-03-24 16:06:20 +00:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							1e738e6ee5 
							
						 
					 
					
						
						
							
							lib: regenerate cabal file with older hpack to silence warning  
						
						
						
					 
					
						2018-03-22 16:42:02 +00:00 
						 
				 
			
				
					
						
							
							
								Peter Simons 
							
						 
					 
					
						
						
						
						
							
						
						
							b3e4abe46d 
							
						 
					 
					
						
						
							
							hledger-lib: re-generate the hledger-lib.cabal file  
						
						
						
					 
					
						2018-03-22 16:08:17 +00:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							7635f56a5c 
							
						 
					 
					
						
						
							
							lib: add conditional dep to package.yaml and rest of cabal file  
						
						
						
					 
					
						2018-03-12 23:27:23 +00:00 
						 
				 
			
				
					
						
							
							
								Peter Simons 
							
						 
					 
					
						
						
						
						
							
						
						
							4c5a58ec1e 
							
						 
					 
					
						
						
							
							hledger-lib: add missing Semigroup instance for Journal  
						
						... 
						
						
						
						GHC 8.4.1 makes Semigroup a superclass of Monoid. See
https://prime.haskell.org/wiki/Libraries/Proposals/SemigroupMonoid 
for details. 
						
					 
					
						2018-03-12 23:17:14 +00:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							6aa35b5cb8 
							
						 
					 
					
						
						
							
							lib: move easytest tests to lib, depend on released version  
						
						
						
					 
					
						2018-03-05 17:27:13 -08:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							92d48ed0a2 
							
						 
					 
					
						
						
							
							lib/ui/web/api: move manuals to extra-source-files in these pkgs too  
						
						... 
						
						
						
						[ci skip] 
						
					 
					
						2018-01-26 11:49:26 -08:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							bc3f5c476c 
							
						 
					 
					
						
						
							
							bump version to 1.5.99  
						
						
						
					 
					
						2018-01-04 10:15:03 -08:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							956dee9682 
							
						 
					 
					
						
						
							
							update cabal files  
						
						
						
					 
					
						2017-12-31 10:24:15 -08:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							0d8ac2cd6f 
							
						 
					 
					
						
						
							
							update cabal files  
						
						
						
					 
					
						2017-12-31 10:03:50 -08:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							d3363d09d8 
							
						 
					 
					
						
						
							
							allow megaparsec 6.4.0  
						
						
						
					 
					
						2017-12-31 08:47:59 -08:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							2a0e12122c 
							
						 
					 
					
						
						
							
							tools: regen cabal files with latest stack's hpack to avoid warnings  
						
						
						
					 
					
						2017-12-30 08:47:47 -08:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							aa06d0f9bd 
							
						 
					 
					
						
						
							
							lib, cli, ui: allow ansi-terminal 0.8  
						
						
						
					 
					
						2017-12-29 12:41:22 -08:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							0621a27833 
							
						 
					 
					
						
						
							
							update cabal files  
						
						
						
					 
					
						2017-12-22 10:13:37 -08:00 
						 
				 
			
				
					
						
							
							
								Simon Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							761fc31eb8 
							
						 
					 
					
						
						
							
							lib,cli,ui,web: allow megaparsec 6.3.0  
						
						
						
					 
					
						2017-12-15 12:32:11 -08:00