Commit graph

4296 commits

Author SHA1 Message Date
Aeywoo
3f8f61504b
Merge branch 'master' into patch-1 2022-04-05 13:55:00 +09:30
Aeywoo
89ddd4ba32
Merge pull request #40 from HooferDevelops/master
Add Oaklands
2022-04-05 13:53:57 +09:30
Aeywoo
f11617a832
Merge branch 'master' into master 2022-04-05 13:53:11 +09:30
Aeywoo
92ca95eb18
Merge pull request #39 from Matojeje/master
Add Pokémon Workshop
2022-04-05 13:52:07 +09:30
Aeywoo
e37f06fa6f
Merge branch 'master' into master 2022-04-05 13:51:24 +09:30
Aeywoo
72c98cd5f4
Merge pull request #38 from err53/patch-1
Add McMaster University Crest
2022-04-05 13:49:39 +09:30
Aeywoo
6567910652
Merge branch 'master' into patch-1 2022-04-05 13:49:06 +09:30
Aeywoo
034bad2e3e
Merge pull request #37 from the-emerald/patch-2
Add ImmutableX
2022-04-05 13:47:51 +09:30
Aeywoo
a32a9fe6c7
Merge branch 'master' into patch-2 2022-04-05 13:47:19 +09:30
Aeywoo
75d3241dc1
Merge pull request #36 from overlisted/patch-1
Add Rust
2022-04-05 13:46:27 +09:30
Aeywoo
03c5ce2fda
Merge branch 'master' into patch-1 2022-04-05 13:45:42 +09:30
Aeywoo
0efd996608
Merge pull request #35 from the-emerald/patch-1
Add Loopring
2022-04-05 13:42:12 +09:30
Aeywoo
c4ba1d5a69
Merge branch 'master' into patch-1 2022-04-05 13:41:25 +09:30
Aeywoo
ad1a3565e7
Merge pull request #34 from CrankDatSouljaBoy/patch-1
add flag of morocco
2022-04-05 13:40:27 +09:30
enshael
8443007c48 Merge branch 'master' of github.com:enshael/place-atlas 2022-04-05 12:10:07 +08:00
enshael
923916498b Add more related entries 2022-04-05 12:09:49 +08:00
Aeywoo
a525c750b8
Merge branch 'master' into patch-1 2022-04-05 13:39:43 +09:30
Aeywoo
42054c2dd2
Merge pull request #33 from Averrie/patch-1
Added Genshin Impact
2022-04-05 13:37:55 +09:30
Aeywoo
f278e0f1e5
Merge branch 'master' into patch-1 2022-04-05 13:36:21 +09:30
Aeywoo
ae25460324
Merge pull request #31 from Kn0ax/patch-1
Added Loky Ronin
2022-04-05 13:35:22 +09:30
Aeywoo
2206382712
Merge branch 'master' into patch-1 2022-04-05 13:34:46 +09:30
enshael
5b9a33a0ee Add 8bit saber
https://www.reddit.com/r/placeAtlas2/comments/twl909/new_entry_for_rgrandorder/
2022-04-05 12:02:21 +08:00
Aeywoo
dd8f6c3241
Merge pull request #30 from adri326/patch-1
Add the sun from oneshot
2022-04-05 13:30:52 +09:30
Aeywoo
6dad547b84
Updated atlas.js
Added missing comma.
2022-04-05 13:29:54 +09:30
Aeywoo
2879b47966
Merge branch 'master' into patch-1 2022-04-05 13:28:30 +09:30
enshael
7725b0f9a1
Merge branch 'master' into master 2022-04-05 11:53:30 +08:00
Aeywoo
c2df791529
Merge pull request #29 from fearherbs1/master
add Steins;Gate Divergence Meter
2022-04-05 13:23:30 +09:30
enshael
dcf2c302cb Add r/nekoarc 2022-04-05 11:53:04 +08:00
Aeywoo
49117389db
Merge branch 'master' into master 2022-04-05 13:23:00 +09:30
Aeywoo
4ef84bae39
Merge pull request #21 from Tux9001/patch-1
Fixed truttle1
2022-04-05 13:21:14 +09:30
Aeywoo
4215cdb8ff
Merge branch 'master' into patch-1 2022-04-05 13:20:05 +09:30
enshael
c248a05877
Merge branch 'master' into master 2022-04-05 11:47:32 +08:00
Aeywoo
53d5d2b2db
Merge pull request #26 from afrastgeek/patch-1
Add Indomie Logo area
2022-04-05 13:16:26 +09:30
Aeywoo
0b461ad1d6
Missing comma.
Added a missing comma from reviewing conflicts.
2022-04-05 13:15:50 +09:30
Aeywoo
2a4da3cfda
Merge branch 'master' into patch-1 2022-04-05 13:13:30 +09:30
enshael
365f1ffe11 Add r/grandorder entries 2022-04-05 11:41:26 +08:00
Aeywoo
6f8e0d312b
Merge pull request #27 from williambulin/master
Added forsenE
2022-04-05 13:06:11 +09:30
Aeywoo
bdde05ad87
Merge branch 'master' into master 2022-04-05 13:05:45 +09:30
Aeywoo
24ce33a1c1
Merge pull request #25 from rm20killer/patch-3
added DMU
2022-04-05 13:03:16 +09:30
Aeywoo
279ddb9be2
Merge branch 'master' into patch-3 2022-04-05 13:02:58 +09:30
Aeywoo
04dc332b07
Merge pull request #24 from L33Tech/master
Add SMP Online, Place Start, The Blue Corner
2022-04-05 12:59:28 +09:30
Aeywoo
e1bd5eb653
Merge branch 'master' into master 2022-04-05 12:59:09 +09:30
Aeywoo
57afd1165c
Merge pull request #23 from NhehGuy/patch-1
Update atlas.js
2022-04-05 12:57:48 +09:30
Aeywoo
ff06dc0ca3
Merge branch 'master' into patch-1 2022-04-05 12:57:27 +09:30
Aeywoo
4b28d74d4c
Merge pull request #22 from nickorlow/patch-1
Add location for UT Austin
2022-04-05 12:55:37 +09:30
flokkies
60a3c612c3
Merge branch 'master' into patch-1 2022-04-05 00:24:18 -03:00
Aeywoo
f6cddc2065
Merge branch 'master' into patch-1 2022-04-05 12:53:25 +09:30
Aeywoo
ef9e523789
Merge pull request #19 from Codixer/feature/contributors
Expands about page and adds contributing.md
2022-04-05 12:50:52 +09:30
Aeywoo
dbe0ceb017
Merge branch 'master' into feature/contributors 2022-04-05 12:49:45 +09:30
Aeywoo
b81e8fd80f
Merge branch 'master' into patch-2 2022-04-05 12:39:56 +09:30